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

Make the master interface available in UDR.

Browse Source
This commit is contained in:
asfernandes 2013-05-23 15:53:06 +00:00
parent e2d4568239
commit cf42eaf4d5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/udr/UdrCppExample.cpp
View File

@ -111,9 +111,6 @@ namespace
}
static IMaster* master = fb_get_master_interface();
//------------------------------------------------------------------------------

18
src/include/firebird/UdrCppEngine.h
View File

@ -515,9 +515,10 @@ public:
{
}
void* operator new(size_t size, const IRoutineMetadata* metadata)
void* operator new(size_t size, IMaster* master, const IRoutineMetadata* metadata)
{
Function* p = reinterpret_cast<Function*>(::new char[size]);
p->master = master;
p->metadata = metadata;
return p;
}
@ -528,6 +529,7 @@ public:
}
public:
IMaster* master;
const IRoutineMetadata* metadata;
};
@ -556,9 +558,10 @@ public:
{
}
void* operator new(size_t size, const IRoutineMetadata* metadata)
void* operator new(size_t size, IMaster* master, const IRoutineMetadata* metadata)
{
Procedure* p = reinterpret_cast<Procedure*>(::new char[size]);
p->master = master;
p->metadata = metadata;
return p;
}
@ -569,6 +572,7 @@ public:
}
public:
IMaster* master;
const IRoutineMetadata* metadata;
};
@ -597,9 +601,10 @@ public:
{
}
void* operator new(size_t size, const IRoutineMetadata* metadata)
void* operator new(size_t size, IMaster* master, const IRoutineMetadata* metadata)
{
Trigger* p = reinterpret_cast<Trigger*>(::new char[size]);
p->master = master;
p->metadata = metadata;
return p;
}
@ -610,6 +615,7 @@ public:
}
public:
IMaster* master;
const IRoutineMetadata* metadata;
};
@ -632,7 +638,7 @@ public:
virtual ExternalFunction* FB_CARG newItem(IStatus* status, ExternalContext* context,
const IRoutineMetadata* metadata)
{
T* obj = new(metadata) Routine<T>;
T* obj = new(context->getMaster(), metadata) Routine<T>;
obj->initialize(status, context);
return obj;
}
@ -657,7 +663,7 @@ public:
virtual ExternalProcedure* FB_CARG newItem(IStatus* status, ExternalContext* context,
const IRoutineMetadata* metadata)
{
T* obj = new(metadata) Routine<T>;
T* obj = new(context->getMaster(), metadata) Routine<T>;
obj->initialize(status, context);
return obj;
}
@ -681,7 +687,7 @@ public:
virtual ExternalTrigger* FB_CARG newItem(IStatus* status, ExternalContext* context,
const IRoutineMetadata* metadata)
{
T* obj = new(metadata) Routine<T>;
T* obj = new(context->getMaster(), metadata) Routine<T>;
obj->initialize(status, context);
return obj;
}