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

Undo part of previous commit: it is not good to make internal type (ThreadId) as public

Browse Source
This commit is contained in:
hvlad 2012-03-01 15:42:24 +00:00
parent adf02dd070
commit 4041b0e780
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/firebird/Interface.h
View File

@ -108,7 +108,7 @@ public:
virtual IPluginManager* FB_CARG getPluginManager() = 0;
virtual int FB_CARG upgradeInterface(IVersioned* toUpgrade, int desiredVersion,
struct UpgradeInfo* upgradeInfo) = 0;
virtual const char* FB_CARG circularAlloc(const char* s, size_t len, ThreadId thr) = 0;
virtual const char* FB_CARG circularAlloc(const char* s, size_t len, intptr_t thr) = 0;
virtual ITimerControl* FB_CARG getTimerControl() = 0;
virtual IDtc* FB_CARG getDtc() = 0;
virtual IAttachment* registerAttachment(IProvider* provider, IAttachment* attachment) = 0;

2
src/yvalve/MasterImplementation.cpp
View File

@ -416,7 +416,7 @@ Firebird::GlobalPtr<StringsBuffer> allStrings;
namespace Why {
const char* FB_CARG MasterImplementation::circularAlloc(const char* s, size_t len, ThreadId thr)
const char* FB_CARG MasterImplementation::circularAlloc(const char* s, size_t len, intptr_t thr)
{
return allStrings->alloc(s, len, thr);
}

2
src/yvalve/MasterImplementation.h
View File

@ -59,7 +59,7 @@ namespace Why
Firebird::IPluginManager* FB_CARG getPluginManager();
int FB_CARG upgradeInterface(Firebird::IVersioned* toUpgrade, int desiredVersion,
Firebird::UpgradeInfo* upgradeInfo);
const char* FB_CARG circularAlloc(const char* s, size_t len, ThreadId thr);
const char* FB_CARG circularAlloc(const char* s, size_t len, intptr_t thr);
Firebird::ITimerControl* FB_CARG getTimerControl();
Firebird::IAttachment* registerAttachment(Firebird::IProvider* provider,
Firebird::IAttachment* attachment);