diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-01-11 16:15:49 -0500 |
| commit | f6a5299766fe3db2273afd78f145486b091513ed (patch) | |
| tree | 87eead6b9fa33e43f7b863093fd410167d9cb23a /cpp/test/Ice/background/Configuration.h | |
| parent | Fixed Glacier2/router IE browser test failure (diff) | |
| download | ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.bz2 ice-f6a5299766fe3db2273afd78f145486b091513ed.tar.xz ice-f6a5299766fe3db2273afd78f145486b091513ed.zip | |
Moved UniquePtr to IceInternal
Removed ctor and assignment operator from UniquePtr
Diffstat (limited to 'cpp/test/Ice/background/Configuration.h')
| -rw-r--r-- | cpp/test/Ice/background/Configuration.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h index 29e7026d90c..367dfaa4429 100644 --- a/cpp/test/Ice/background/Configuration.h +++ b/cpp/test/Ice/background/Configuration.h @@ -11,6 +11,7 @@ #define TEST_CONFIGURATION_H #include <IceUtil/IceUtil.h> +#include <Ice/UniquePtr.h> #include <Ice/LocalException.h> #include <Ice/Selector.h> @@ -53,15 +54,15 @@ public: private: - IceUtil::UniquePtr<Ice::LocalException> _connectorsException; - IceUtil::UniquePtr<Ice::LocalException> _connectException; + IceInternal::UniquePtr<Ice::LocalException> _connectorsException; + IceInternal::UniquePtr<Ice::LocalException> _connectException; IceInternal::SocketOperation _initializeSocketOperation; int _initializeResetCount; - IceUtil::UniquePtr<Ice::LocalException> _initializeException; + IceInternal::UniquePtr<Ice::LocalException> _initializeException; int _readReadyCount; - IceUtil::UniquePtr<Ice::LocalException> _readException; + IceInternal::UniquePtr<Ice::LocalException> _readException; int _writeReadyCount; - IceUtil::UniquePtr<Ice::LocalException> _writeException; + IceInternal::UniquePtr<Ice::LocalException> _writeException; bool _buffered; static Configuration* _instance; |