diff options
| author | Bernard Normier <bernard@zeroc.com> | 2003-05-18 05:59:11 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2003-05-18 05:59:11 +0000 |
| commit | d48897bd82132ba8ef0cd95ffb613af3741cc4e0 (patch) | |
| tree | d3e2f32e918e708c53ce48253e25552ef2e5875b /cpp/src | |
| parent | Fixed bug introduced by previous commit (diff) | |
| download | ice-d48897bd82132ba8ef0cd95ffb613af3741cc4e0.tar.bz2 ice-d48897bd82132ba8ef0cd95ffb613af3741cc4e0.tar.xz ice-d48897bd82132ba8ef0cd95ffb613af3741cc4e0.zip | |
VC++ 7.1 port
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Freeze/DBI.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/src/Freeze/DBI.cpp b/cpp/src/Freeze/DBI.cpp index 862ec6723e4..d57f2fd7636 100644 --- a/cpp/src/Freeze/DBI.cpp +++ b/cpp/src/Freeze/DBI.cpp @@ -19,6 +19,7 @@ #include <Freeze/StrategyI.h> #include <Freeze/Initialize.h> #include <sys/stat.h> +#include <stdlib.h> using namespace std; using namespace Ice; @@ -161,6 +162,11 @@ Freeze::DBEnvironmentI::DBEnvironmentI(const CommunicatorPtr& communicator, cons checkBerkeleyDBReturn(db_env_create(&_dbEnv, 0), _errorPrefix, "db_env_create"); +#ifdef _WIN32 + // Berkeley DB may use a different C++ runtime + checkBerkeleyDBReturn(_dbEnv->set_alloc(_dbEnv, ::malloc, ::realloc, ::free), _errorPrefix, "DB_ENV->set_alloc"); +#endif + u_int32_t flags = DB_CREATE | DB_INIT_LOCK | DB_INIT_MPOOL; if(txn) { |