diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-09-09 20:47:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-09-09 20:47:14 +0200 |
| commit | 42046f618d3ca66f8fa1ff8f27f862416d3d0ac8 (patch) | |
| tree | 48f1ef05110d097025e4c68f786713c3cd75a1a3 /cpp/src/Ice/Instance.cpp | |
| parent | - cpp/demo/Ice/session now uses a timer for the periodic reaping. (diff) | |
| download | ice-42046f618d3ca66f8fa1ff8f27f862416d3d0ac8.tar.bz2 ice-42046f618d3ca66f8fa1ff8f27f862416d3d0ac8.tar.xz ice-42046f618d3ca66f8fa1ff8f27f862416d3d0ac8.zip | |
Fixed Visual Studio compilation error related to printStackTraces and minor cleanup
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 790c34cead1..c5b2b4bff1b 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -57,17 +57,11 @@ using namespace std; using namespace Ice; using namespace IceInternal; -namespace IceUtil -{ - -extern bool ICE_DECLSPEC_IMPORT nullHandleAbort; - -} - namespace IceUtilInternal { -extern bool printStackTraces; +extern bool ICE_DECLSPEC_IMPORT nullHandleAbort; +extern bool ICE_DECLSPEC_IMPORT printStackTraces; }; @@ -829,7 +823,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi if(_initData.properties->getPropertyAsInt("Ice.NullHandleAbort") > 0) { - IceUtil::nullHandleAbort = true; + IceUtilInternal::nullHandleAbort = true; } #ifdef NDEBUG |