Author: veithm
Date: Wed Dec 11 09:12:09 2013
New Revision: 1550077
URL: http://svn.apache.org/r1550077
Log:
ETCH-277 Fixed Corrupt inheritance in ::equals and ::getHashCode functions
Change-Id: I77ad4b631e2e3d95cc2b3fff13e15390e8c39cbb
Modified:
etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h
etch/trunk/binding-cpp/runtime/include/common/EtchException.h
etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h
etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp
etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp
etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp
etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
Modified:
etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h
(original)
+++ etch/trunk/binding-cpp/runtime/include/common/EtchAuthenticationException.h
Wed Dec 11 09:12:09 2013
@@ -41,7 +41,7 @@ public:
virtual ~EtchAuthenticationException();
//Overridden
- capu::bool_t equals(const EtchObject* other);
+ capu::bool_t equals(const EtchObject* other) const;
};
Modified: etch/trunk/binding-cpp/runtime/include/common/EtchException.h
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/common/EtchException.h?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/common/EtchException.h (original)
+++ etch/trunk/binding-cpp/runtime/include/common/EtchException.h Wed Dec 11
09:12:09 2013
@@ -55,7 +55,7 @@ public:
virtual ~EtchException();
//overridden
- virtual capu::bool_t equals(const EtchObject * other);
+ virtual capu::bool_t equals(const EtchObject * other) const;
/**
*
Modified: etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h
(original)
+++ etch/trunk/binding-cpp/runtime/include/common/EtchRuntimeException.h Wed
Dec 11 09:12:09 2013
@@ -52,7 +52,7 @@ public:
virtual ~EtchRuntimeException();
//Overridden
- capu::bool_t equals(const EtchObject* other);
+ capu::bool_t equals(const EtchObject* other) const;
};
Modified: etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h (original)
+++ etch/trunk/binding-cpp/runtime/include/serialization/EtchType.h Wed Dec 11
09:12:09 2013
@@ -186,7 +186,7 @@ public:
void lock();
//overridden
- capu::bool_t equals(EtchObject *other);
+ capu::bool_t equals(const EtchObject *other) const;
/**
* @return the associated import / export helper.
@@ -238,7 +238,7 @@ public:
* hash code
* @return hash
*/
- capu::uint64_t getHashCode();
+ capu::uint32_t getHashCode() const;
/**
* returns component type
Modified:
etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
---
etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp
(original)
+++
etch/trunk/binding-cpp/runtime/src/main/common/EtchAuthenticationException.cpp
Wed Dec 11 09:12:09 2013
@@ -35,7 +35,7 @@ EtchAuthenticationException::~EtchAuthen
}
-capu::bool_t EtchAuthenticationException::equals(const EtchObject* other) {
+capu::bool_t EtchAuthenticationException::equals(const EtchObject* other)
const {
if (other == NULL)
return false;
else if (other->getObjectType() != EtchAuthenticationException::TYPE())
Modified: etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/common/EtchException.cpp Wed Dec 11
09:12:09 2013
@@ -40,7 +40,7 @@ EtchException::~EtchException() {
}
-capu::bool_t EtchException::equals(const EtchObject* other) {
+capu::bool_t EtchException::equals(const EtchObject* other) const {
if (other == NULL)
return false;
if (other->getObjectType() != EtchException::TYPE())
Modified:
etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp
(original)
+++ etch/trunk/binding-cpp/runtime/src/main/common/EtchRuntimeException.cpp Wed
Dec 11 09:12:09 2013
@@ -37,7 +37,7 @@ EtchRuntimeException::~EtchRuntimeExcept
}
-capu::bool_t EtchRuntimeException::equals(const EtchObject* other) {
+capu::bool_t EtchRuntimeException::equals(const EtchObject* other) const {
if (other == NULL)
return false;
else if (other->getObjectType() != EtchRuntimeException::TYPE())
Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
URL:
http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp?rev=1550077&r1=1550076&r2=1550077&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp
(original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchType.cpp Wed Dec
11 09:12:09 2013
@@ -59,7 +59,7 @@ EtchType::~EtchType() {
}
}
-capu::uint64_t EtchType::getHashCode() {
+capu::uint32_t EtchType::getHashCode() const {
return mId.getHashCode() ^ mName.getHashCode();
}
@@ -171,7 +171,7 @@ void EtchType::lock() {
mFieldMap.lock();
}
-capu::bool_t EtchType::equals(EtchObject *other) {
+capu::bool_t EtchType::equals(const EtchObject *other) const {
if (other == NULL)
return false;
if (other->getObjectType() != EtchType::TYPE())
