diff options
| author | Marc Laukien <marc@zeroc.com> | 2001-09-09 03:41:00 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2001-09-09 03:41:00 +0000 |
| commit | ae40e5b7417df04d038df49eb5e028de4474a886 (patch) | |
| tree | b4bb7a415903720b5786048bf2f4b33283976cfc | |
| parent | more tests, fixes to operator< and operator== (diff) | |
| download | ice-ae40e5b7417df04d038df49eb5e028de4474a886.tar.bz2 ice-ae40e5b7417df04d038df49eb5e028de4474a886.tar.xz ice-ae40e5b7417df04d038df49eb5e028de4474a886.zip | |
fixes
| -rw-r--r-- | cpp/include/Ice/Handle.h | 4 | ||||
| -rw-r--r-- | cpp/include/Ice/ProxyHandle.h | 4 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Handle.h | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/AllTests.cpp | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/cpp/include/Ice/Handle.h b/cpp/include/Ice/Handle.h index 60b83d191fc..71bf7dbae4e 100644 --- a/cpp/include/Ice/Handle.h +++ b/cpp/include/Ice/Handle.h @@ -173,7 +173,7 @@ template<typename T, typename U> inline bool operator==(const Handle<T>& a, const Handle<U>& b) { T* ap = a.get(); - T* bp = b.get(); + U* bp = b.get(); if (ap == bp) { return true; @@ -193,7 +193,7 @@ template<typename T, typename U> inline bool operator<(const Handle<T>& a, const Handle<U>& b) { T* ap = a.get(); - T* bp = b.get(); + U* bp = b.get(); if (!ap || !bp) { if (!ap && bp) diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h index 8b9ab8f54e0..5a9d0069bef 100644 --- a/cpp/include/Ice/ProxyHandle.h +++ b/cpp/include/Ice/ProxyHandle.h @@ -149,7 +149,7 @@ template<typename T, typename U> inline bool operator==(const ProxyHandle<T>& a, const ProxyHandle<U>& b) { T* ap = a.get(); - T* bp = b.get(); + U* bp = b.get(); if (ap == bp) { return true; @@ -169,7 +169,7 @@ template<typename T, typename U> inline bool operator<(const ProxyHandle<T>& a, const ProxyHandle<U>& b) { T* ap = a.get(); - T* bp = b.get(); + U* bp = b.get(); if (!ap || !bp) { if (!ap && bp) diff --git a/cpp/include/IceUtil/Handle.h b/cpp/include/IceUtil/Handle.h index 5d9c91393d5..272cc5baef3 100644 --- a/cpp/include/IceUtil/Handle.h +++ b/cpp/include/IceUtil/Handle.h @@ -165,7 +165,7 @@ template<typename T, typename U> inline bool operator==(const Handle<T>& a, const Handle<U>& b) { T* ap = a.get(); - T* bp = b.get(); + U* bp = b.get(); if (ap == bp) { return true; @@ -185,7 +185,7 @@ template<typename T, typename U> inline bool operator<(const Handle<T>& a, const Handle<U>& b) { T* ap = a.get(); - T* bp = b.get(); + U* bp = b.get(); if (!ap || !bp) { if (!ap && bp) diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index 4b3a680d0b9..d2c22765235 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -34,6 +34,9 @@ allTests(Ice::CommunicatorPtr communicator) M_B::C_BPrx cb = initial->c_b(); M_A::C_CPrx cc = initial->c_c(); M_A::C_DPrx cd = initial->c_d(); + cout << ca->_getIdentity() << ", " << cb->_getIdentity() << endl; + cout << ca->_getIdentity() << ", " << cc->_getIdentity() << endl; + cout << ca->_getIdentity() << ", " << cd->_getIdentity() << endl; test(ca != cb); test(ca != cc); test(ca != cd); |