summaryrefslogtreecommitdiff
path: root/cpp/src/IceBT
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2017-01-11 16:15:49 -0500
committerBernard Normier <bernard@zeroc.com>2017-01-11 16:15:49 -0500
commitf6a5299766fe3db2273afd78f145486b091513ed (patch)
tree87eead6b9fa33e43f7b863093fd410167d9cb23a /cpp/src/IceBT
parentFixed Glacier2/router IE browser test failure (diff)
downloadice-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/src/IceBT')
-rw-r--r--cpp/src/IceBT/TransceiverI.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceBT/TransceiverI.h b/cpp/src/IceBT/TransceiverI.h
index 705d22865a4..9df1032702f 100644
--- a/cpp/src/IceBT/TransceiverI.h
+++ b/cpp/src/IceBT/TransceiverI.h
@@ -15,7 +15,7 @@
#include <IceBT/StreamSocket.h>
#include <Ice/Transceiver.h>
-#include <IceUtil/UniquePtr.h>
+#include <Ice/UniquePtr.h>
namespace IceBT
{
@@ -56,7 +56,7 @@ private:
std::string _addr;
std::string _uuid;
bool _needConnect;
- IceUtil::UniquePtr<Ice::Exception> _exception;
+ IceInternal::UniquePtr<Ice::Exception> _exception;
IceUtil::Monitor<IceUtil::Mutex> _lock;
void connectCompleted(int, const ConnectionPtr&);