firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 02:03:04 +01:00
Code Issues

Fixed POSIX build (CORE-4654)

Browse Source
This commit is contained in:
starodubov 2014-12-29 10:56:35 +00:00
parent cb008dc6f0
commit a8c8f22de0
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jrd/trace/TraceObjects.h
View File

@ -138,7 +138,7 @@ class TraceBLRStatementImpl : public BLRPrinter<TraceBLRStatementImpl>
{
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 @@ class TraceFailedBLRStatement : public BLRPrinter<TraceFailedBLRStatement>
{
public:
TraceFailedBLRStatement(const unsigned char* blr, unsigned length) :
BLRPrinter(blr, length)
BLRPrinter<TraceFailedBLRStatement>(blr, length)
{}
int getStmtID() { return 0; }

2
src/yvalve/YObjects.h
View File

@ -245,7 +245,7 @@ public:
private:
YTransaction(YTransaction* from)
: YHelper(from->next),
: YHelper<YTransaction, Firebird::Api::ITransactionImpl<YTransaction> >(from->next),
attachment(from->attachment),
childBlobs(getPool()),
childCursors(getPool()),

18
src/yvalve/why.cpp
View File

@ -3710,7 +3710,7 @@ YEvents::YEvents(YAttachment* aAttachment, IEvents* aNext, IEventCallback* aCall
attachment(aAttachment),
callback(aCallback)
***/
: YHelper(aNext)
: YHelper<YEvents, Firebird::Api::IEventsImpl<YEvents> >(aNext)
{
attachment = aAttachment;
callback = aCallback;
@ -3755,7 +3755,7 @@ void YEvents::cancel(IStatus* status)
YRequest::YRequest(YAttachment* aAttachment, IRequest* aNext)
: YHelper(aNext),
: YHelper<YRequest, Firebird::Api::IRequestImpl<YRequest> >(aNext),
attachment(aAttachment),
userHandle(NULL)
{
@ -3894,7 +3894,7 @@ void YRequest::free(IStatus* status)
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 @@ int YBlob::seek(IStatus* status, int mode, int offset)
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 @@ void YStatement::free(IStatus* status)
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, IR
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 @@ void YResultSet::close(IStatus* status)
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 @@ YTransaction* YTransaction::enterDtc(IStatus* status)
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 @@ void YAttachment::getNextTransaction(IStatus* status, ITransaction* tra, NextTra
YService::YService(IProvider* aProvider, IService* aNext, bool utf8)
: YHelper(aNext),
: YHelper<YService, Firebird::Api::IServiceImpl<YService> >(aNext),
provider(aProvider),
utf8Connection(utf8)
{