I strongly disagree with poisoning of trunk sources with such "fixes" in order to make ancient buggy compilers happy. I suggest to rollback that changes.
Alex. ****************************************************************************** -------- Original Message -------- Subject: [Firebird-checkins] SF.net SVN: firebird:[60440] firebird/trunk/src Date: Mon, 29 Dec 2014 10:56:36 +0000 From: [email protected] To: [email protected] Revision: 60440 http://sourceforge.net/p/firebird/code/60440 Author: starodubov Date: 2014-12-29 10:56:35 +0000 (Mon, 29 Dec 2014) Log Message: ----------- Fixed POSIX build (CORE-4654) Modified Paths: -------------- firebird/trunk/src/jrd/trace/TraceObjects.h firebird/trunk/src/yvalve/YObjects.h firebird/trunk/src/yvalve/why.cpp Modified: firebird/trunk/src/jrd/trace/TraceObjects.h =================================================================== --- firebird/trunk/src/jrd/trace/TraceObjects.h 2014-12-27 09:21:30 UTC (rev 60439) +++ firebird/trunk/src/jrd/trace/TraceObjects.h 2014-12-29 10:56:35 UTC (rev 60440) @@ -138,7 +138,7 @@ { public: TraceBLRStatementImpl(const jrd_req* stmt, PerformanceInfo* perf) : - BLRPrinter(stmt->getStatement()->blr.begin(), stmt->getStatement()->blr.getCount()), + BLRPrinter<TraceBLRStatementImpl>(stmt->getStatement()->blr.begin(), stmt->getStatement()->blr.getCount()), m_stmt(stmt), m_perf(perf) {} @@ -156,7 +156,7 @@ { public: TraceFailedBLRStatement(const unsigned char* blr, unsigned length) : - BLRPrinter(blr, length) + BLRPrinter<TraceFailedBLRStatement>(blr, length) {} int getStmtID() { return 0; } Modified: firebird/trunk/src/yvalve/YObjects.h =================================================================== --- firebird/trunk/src/yvalve/YObjects.h 2014-12-27 09:21:30 UTC (rev 60439) +++ firebird/trunk/src/yvalve/YObjects.h 2014-12-29 10:56:35 UTC (rev 60440) @@ -245,7 +245,7 @@ private: YTransaction(YTransaction* from) - : YHelper(from->next), + : YHelper<YTransaction, Firebird::Api::ITransactionImpl<YTransaction> >(from->next), attachment(from->attachment), childBlobs(getPool()), childCursors(getPool()), Modified: firebird/trunk/src/yvalve/why.cpp =================================================================== --- firebird/trunk/src/yvalve/why.cpp 2014-12-27 09:21:30 UTC (rev 60439) +++ firebird/trunk/src/yvalve/why.cpp 2014-12-29 10:56:35 UTC (rev 60440) @@ -3710,7 +3710,7 @@ attachment(aAttachment), callback(aCallback) ***/ - : YHelper(aNext) + : YHelper<YEvents, Firebird::Api::IEventsImpl<YEvents> >(aNext) { attachment = aAttachment; callback = aCallback; @@ -3755,7 +3755,7 @@ YRequest::YRequest(YAttachment* aAttachment, IRequest* aNext) - : YHelper(aNext), + : YHelper<YRequest, Firebird::Api::IRequestImpl<YRequest> >(aNext), attachment(aAttachment), userHandle(NULL) { @@ -3894,7 +3894,7 @@ YBlob::YBlob(YAttachment* aAttachment, YTransaction* aTransaction, IBlob* aNext) - : YHelper(aNext), + : YHelper<YBlob, Firebird::Api::IBlobImpl<YBlob> >(aNext), attachment(aAttachment), transaction(aTransaction) { @@ -4015,7 +4015,7 @@ YStatement::YStatement(YAttachment* aAttachment, IStatement* aNext) - : YHelper(aNext), + : YHelper<YStatement, Firebird::Api::IStatementImpl<YStatement> >(aNext), attachment(aAttachment), cursor(NULL), input(true), output(false) { attachment->childStatements.add(this); @@ -4272,7 +4272,7 @@ YResultSet::YResultSet(YAttachment* anAttachment, YTransaction* aTransaction, IResultSet* aNext) - : YHelper(aNext), + : YHelper<YResultSet, Firebird::Api::IResultSetImpl<YResultSet> >(aNext), attachment(anAttachment), transaction(aTransaction), statement(NULL) @@ -4283,7 +4283,7 @@ YResultSet::YResultSet(YAttachment* anAttachment, YTransaction* aTransaction, YStatement* aStatement, IResultSet* aNext) - : YHelper(aNext), + : YHelper<YResultSet, Firebird::Api::IResultSetImpl<YResultSet> >(aNext), attachment(anAttachment), transaction(aTransaction), statement(aStatement) @@ -4508,7 +4508,7 @@ YTransaction::YTransaction(YAttachment* aAttachment, ITransaction* aNext) - : YHelper(aNext), + : YHelper<YTransaction, Firebird::Api::ITransactionImpl<YTransaction> >(aNext), attachment(aAttachment), childBlobs(getPool()), childCursors(getPool()), @@ -4763,7 +4763,7 @@ YAttachment::YAttachment(IProvider* aProvider, IAttachment* aNext, const PathName& aDbPath) - : YHelper(aNext), + : YHelper<YAttachment, Firebird::Api::IAttachmentImpl<YAttachment> >(aNext), provider(aProvider), dbPath(getPool(), aDbPath), childBlobs(getPool()), @@ -5295,7 +5295,7 @@ YService::YService(IProvider* aProvider, IService* aNext, bool utf8) - : YHelper(aNext), + : YHelper<YService, Firebird::Api::IServiceImpl<YService> >(aNext), provider(aProvider), utf8Connection(utf8) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net _______________________________________________ Firebird-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/firebird-checkins ------------------------------------------------------------------------------ Dive into the World of Parallel Programming! The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net Firebird-Devel mailing list, web interface at https://lists.sourceforge.net/lists/listinfo/firebird-devel
