summaryrefslogtreecommitdiff
path: root/cppe
diff options
context:
space:
mode:
Diffstat (limited to 'cppe')
-rwxr-xr-xcppe/include/IceE/Connection.h2
-rw-r--r--cppe/include/IceE/Object.h3
-rw-r--r--cppe/test/IceE/slicing/AllTests.cpp2
-rw-r--r--cppe/test/IceE/slicing/TestI.h2
4 files changed, 4 insertions, 5 deletions
diff --git a/cppe/include/IceE/Connection.h b/cppe/include/IceE/Connection.h
index 6daed9a277f..23761c38d62 100755
--- a/cppe/include/IceE/Connection.h
+++ b/cppe/include/IceE/Connection.h
@@ -26,7 +26,7 @@
#include <IceE/Mutex.h>
#include <IceE/Monitor.h>
-#include <IceE/Time.h> // XXX: This will result in a bug.
+#include <IceE/Time.h>
#include <IceE/Thread.h> // For ThreadPerConnection.
#include <IceE/Identity.h>
#include <IceE/BasicStream.h>
diff --git a/cppe/include/IceE/Object.h b/cppe/include/IceE/Object.h
index c4e3101c680..93146b96321 100644
--- a/cppe/include/IceE/Object.h
+++ b/cppe/include/IceE/Object.h
@@ -29,8 +29,6 @@ class ICEE_API Object : public IceUtil::Shared
{
public:
- Object() {};
-
virtual bool operator==(const Object&) const;
virtual bool operator!=(const Object&) const;
virtual bool operator<(const Object&) const;
@@ -61,6 +59,7 @@ public:
protected:
+ Object() {};
virtual ~Object() {} // This class is abstract.
};
diff --git a/cppe/test/IceE/slicing/AllTests.cpp b/cppe/test/IceE/slicing/AllTests.cpp
index 85887f0ba47..0a911e3826e 100644
--- a/cppe/test/IceE/slicing/AllTests.cpp
+++ b/cppe/test/IceE/slicing/AllTests.cpp
@@ -301,7 +301,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
}
}
tprintf("ok\n");
-
+
tprintf("slicing of unknown most derived, unknown intermediate as base... "); fflush(stdout);
{
try
diff --git a/cppe/test/IceE/slicing/TestI.h b/cppe/test/IceE/slicing/TestI.h
index 3f0c3ccb449..639f152ba50 100644
--- a/cppe/test/IceE/slicing/TestI.h
+++ b/cppe/test/IceE/slicing/TestI.h
@@ -37,7 +37,7 @@ public:
private:
- const ::Ice::ObjectAdapterPtr& _adapter;
+ const ::Ice::ObjectAdapterPtr _adapter;
};
#endif