You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by ve...@apache.org on 2014/03/20 11:42:47 UTC
svn commit: r1579585 - in /etch/trunk/binding-cpp:
compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/
runtime/include/common/ runtime/include/support/ runtime/include/transport/
runtime/include/util/ runtime/src/main/serialization/ runt...
Author: veithm
Date: Thu Mar 20 10:42:46 2014
New Revision: 1579585
URL: http://svn.apache.org/r1579585
Log:
ETCH-291 Fixing some compiler warnings
By removing some unused members and by correcting some unsigned/signed
some warnings are gone.
Change-Id: I792674667f276c0928b505bff9a3098ac31f9475
Modified:
etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm
etch/trunk/binding-cpp/runtime/include/common/EtchHashNative.h
etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h
etch/trunk/binding-cpp/runtime/include/support/EtchMailbox.h
etch/trunk/binding-cpp/runtime/include/support/EtchPlainMailbox.h
etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h
etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
etch/trunk/binding-cpp/runtime/include/transport/EtchTransportMessage.h
etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h
etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp
etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
etch/trunk/binding-cpp/runtime/src/main/transport/EtchFlexBuffer.cpp
etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
Modified: etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm (original)
+++ etch/trunk/binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/helper_h.vm Thu Mar 20 10:42:46 2014
@@ -65,6 +65,11 @@ namespace $namespace {
{
public:
/**
+ * Destructor
+ */
+ virtual ~${i}ServerFactory(){}
+
+ /**
* Constructs a new instance implementing ${i}Server. The new
* instance will receive and process messages from the client session.
*
@@ -87,6 +92,11 @@ namespace $namespace {
class ${i}ClientFactory {
public:
/**
+ * Destructor
+ */
+ virtual ~${i}ClientFactory(){}
+
+ /**
* Constructs a new instance implementing ${i}Client. The new
* instance will receive and process messages from the server session.
*
Modified: etch/trunk/binding-cpp/runtime/include/common/EtchHashNative.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/common/EtchHashNative.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/common/EtchHashNative.h (original)
+++ etch/trunk/binding-cpp/runtime/include/common/EtchHashNative.h Thu Mar 20 10:42:46 2014
@@ -26,15 +26,15 @@ class EtchHashNative {
public:
template<class T>
- static capu::uint32_t Digest(T &key, const capu::uint8_t bitSize) {
+ static capu::uint_t Digest(T &key, const capu::uint8_t bitSize) {
return capu::CapuDefaultHashFunction::Digest<T>(key, bitSize);
}
- static capu::uint32_t Digest(char* key, const capu::uint8_t bitSize) {
+ static capu::uint_t Digest(char* key, const capu::uint8_t bitSize) {
return capu::CapuDefaultHashFunction::Digest(key, bitSize);
}
- static capu::uint32_t Digest(const char* key, const capu::uint8_t bitSize) {
+ static capu::uint_t Digest(const char* key, const capu::uint8_t bitSize) {
return capu::CapuDefaultHashFunction::Digest(key, bitSize);
}
Modified: etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h (original)
+++ etch/trunk/binding-cpp/runtime/include/common/EtchObjectHash.h Thu Mar 20 10:42:46 2014
@@ -24,17 +24,17 @@
class EtchObjectHash {
public:
- static capu::uint32_t Digest(const EtchObject &key, const capu::uint8_t bitCount) {
+ static capu::uint_t Digest(const EtchObject &key, const capu::uint8_t bitCount) {
- return capu::Resizer<capu::uint32_t>::Resize(key.getHashCode(),bitCount);
+ return capu::Resizer<capu::uint_t>::Resize(key.getHashCode(),bitCount);
}
- static capu::uint32_t Digest(const EtchObject* key, const capu::uint8_t bitCount) {
- return capu::Resizer<capu::uint32_t>::Resize(key->getHashCode(),bitCount);
+ static capu::uint_t Digest(const EtchObject* key, const capu::uint8_t bitCount) {
+ return capu::Resizer<capu::uint_t>::Resize(key->getHashCode(),bitCount);
}
- static capu::uint32_t Digest(const capu::SmartPointer<EtchObject>& key, const capu::uint8_t bitCount) {
- return capu::Resizer<capu::uint32_t>::Resize(key->getHashCode(),bitCount);
+ static capu::uint_t Digest(const capu::SmartPointer<EtchObject>& key, const capu::uint8_t bitCount) {
+ return capu::Resizer<capu::uint_t>::Resize(key->getHashCode(),bitCount);
}
};
#endif
Modified: etch/trunk/binding-cpp/runtime/include/support/EtchMailbox.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/support/EtchMailbox.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/support/EtchMailbox.h (original)
+++ etch/trunk/binding-cpp/runtime/include/support/EtchMailbox.h Thu Mar 20 10:42:46 2014
@@ -151,6 +151,12 @@ public:
class EtchNotify {
public:
/**
+ * Destructor
+ */
+ virtual ~EtchNotify() {
+ }
+
+ /**
* Notifies of mailbox status change.
* @param mb the mailbox whose status has changed.
* @param state the state object passed in the register
Modified: etch/trunk/binding-cpp/runtime/include/support/EtchPlainMailbox.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/support/EtchPlainMailbox.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/support/EtchPlainMailbox.h (original)
+++ etch/trunk/binding-cpp/runtime/include/support/EtchPlainMailbox.h Thu Mar 20 10:42:46 2014
@@ -133,7 +133,6 @@ private:
EtchMailbox::EtchNotify* mNotify;
EtchObject* mState;
EtchLong mMessageId;
- capu::bool_t mAlarmSet;
EtchCircularQueue mQueue;
capu::Mutex mQueueMutex;
Modified: etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h (original)
+++ etch/trunk/binding-cpp/runtime/include/transport/EtchPacketizer.h Thu Mar 20 10:42:46 2014
@@ -50,7 +50,7 @@ public:
const static EtchString& MAX_PKT_SIZE_TERM();
- const static capu::int32_t& SIG();
+ const static capu::uint32_t& SIG();
const static capu::uint32_t& SIG_SIZE();
Modified: etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h (original)
+++ etch/trunk/binding-cpp/runtime/include/transport/EtchTcpConnection.h Thu Mar 20 10:42:46 2014
@@ -50,7 +50,7 @@ public:
/**
* Destructor
*/
- ~EtchTcpConnection();
+ virtual ~EtchTcpConnection();
/**
* @see TransportData
@@ -82,16 +82,16 @@ public:
* Sets session
*/
void setSession(EtchSessionData* session);
+
+ /**
+ * @see EtchConnection
+ */
+ capu::bool_t isStarted();
/**
* @see EtchConnection
*/
- capu::bool_t isStarted();
-
- /**
- * @see EtchConnection
- */
capu::bool_t isTerminated();
/**
Modified: etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h (original)
+++ etch/trunk/binding-cpp/runtime/include/transport/EtchTcpTransportFactory.h Thu Mar 20 10:42:46 2014
@@ -83,7 +83,7 @@ private:
* @param resources
*/
MySessionListener(EtchRuntime* runtime, EtchTcpTransportFactory* factory, EtchTransport<EtchSessionListener<EtchSocket> > *transport,
- EtchString uri, EtchResources* resources, capu::bool_t secure);
+ EtchString uri, EtchResources* resources);
/**
* Destructor
@@ -141,7 +141,6 @@ private:
EtchTransport<EtchSessionListener<EtchSocket> > *mTransport;
EtchString mUri;
EtchResources* mResources;
- capu::bool_t mIsSecure;
EtchServerFactory* mSession;
EtchList<EtchStack*>* mConnectionStacks;
};
Modified: etch/trunk/binding-cpp/runtime/include/transport/EtchTransportMessage.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/transport/EtchTransportMessage.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/transport/EtchTransportMessage.h (original)
+++ etch/trunk/binding-cpp/runtime/include/transport/EtchTransportMessage.h Thu Mar 20 10:42:46 2014
@@ -28,7 +28,7 @@
/**
* Interface used to deliver messages to the transport from the session.
*/
-class EtchTransportMessage : public virtual EtchTransport<EtchSessionMessage> {
+class EtchTransportMessage : public EtchTransport<EtchSessionMessage> {
public:
Modified: etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h (original)
+++ etch/trunk/binding-cpp/runtime/include/util/EtchLogger.h Thu Mar 20 10:42:46 2014
@@ -54,9 +54,11 @@ public:
, mMessagizerContext(createContext("etch.runtime.messagizer"))
, mValidatorContext(createContext("etch.runtime.messagizer.validator"))
, mMailboxContext(createContext("etch.runtime.mailbox"))
- , mRuntimeContext(createContext("etch.runtime"))
- {
-
+ , mRuntimeContext(createContext("etch.runtime")) {
+ }
+
+ virtual ~EtchLogger() {
+
}
EtchLogContext& getSerializerContext() {
return mSerializerContext;
Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchBinaryTaggedDataOutput.cpp Thu Mar 20 10:42:46 2014
@@ -31,9 +31,9 @@ EtchBinaryTaggedDataOutput::EtchBinaryTa
} else {
mStringTypeAndField = false;
}
- EtchValidatorInt::Get(runtime, 0, mIntValidator);
- EtchValidatorString::Get(runtime, 0, mStringValidator);
- EtchValidatorNone::Get(runtime, mNoneValidator);
+ EtchValidatorInt::Get(mRuntime, 0, mIntValidator);
+ EtchValidatorString::Get(mRuntime, 0, mStringValidator);
+ EtchValidatorNone::Get(mRuntime, mNoneValidator);
}
EtchBinaryTaggedDataOutput::~EtchBinaryTaggedDataOutput() {
Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorBoolean.cpp Thu Mar 20 10:42:46 2014
@@ -30,7 +30,8 @@ const EtchObjectType* EtchValidatorBoole
}
EtchValidatorBoolean::EtchValidatorBoolean(EtchRuntime* runtime, capu::uint32_t ndim)
-: mRuntime(runtime), EtchTypeValidator(EtchValidatorBoolean::TYPE(), EtchBool::TYPE(), EtchBool::TYPE(), ndim) {
+: EtchTypeValidator(EtchValidatorBoolean::TYPE(), EtchBool::TYPE(), EtchBool::TYPE(), ndim)
+, mRuntime(runtime) {
}
EtchValidatorBoolean::EtchValidatorBoolean(const EtchValidatorBoolean& other)
Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Thu Mar 20 10:42:46 2014
@@ -30,12 +30,13 @@ const EtchObjectType* EtchValidatorByte:
}
EtchValidatorByte::EtchValidatorByte(EtchRuntime* runtime, capu::uint32_t ndim)
-: mRuntime(runtime), EtchTypeValidator(EtchValidatorByte::TYPE(), EtchByte::TYPE(), EtchByte::TYPE(), ndim) {
+: EtchTypeValidator(EtchValidatorByte::TYPE(), EtchByte::TYPE(), EtchByte::TYPE(), ndim)
+, mRuntime(runtime) {
}
EtchValidatorByte::EtchValidatorByte(const EtchValidatorByte& other)
-: mRuntime(other.mRuntime), EtchTypeValidator(other) {
-
+: EtchTypeValidator(other)
+, mRuntime(other.mRuntime) {
}
EtchValidatorByte::~EtchValidatorByte() {
Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp Thu Mar 20 10:42:46 2014
@@ -30,12 +30,13 @@ const EtchObjectType* EtchValidatorInt::
}
EtchValidatorInt::EtchValidatorInt(EtchRuntime* runtime, capu::uint32_t ndim)
-: mRuntime(runtime), EtchTypeValidator(EtchValidatorInt::TYPE(), EtchInt32::TYPE(), EtchInt32::TYPE(), ndim) {
+: EtchTypeValidator(EtchValidatorInt::TYPE(), EtchInt32::TYPE(), EtchInt32::TYPE(), ndim)
+, mRuntime(runtime) {
}
EtchValidatorInt::EtchValidatorInt(const EtchValidatorInt& other)
-: mRuntime(other.mRuntime), EtchTypeValidator(other) {
-
+: EtchTypeValidator(other)
+, mRuntime(other.mRuntime) {
}
EtchValidatorInt::~EtchValidatorInt() {
Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp Thu Mar 20 10:42:46 2014
@@ -31,7 +31,7 @@ public:
* Create a new instance of EtchFreePoolRunnable class.
*/
EtchFreePoolRunnable(EtchFreePool* pool, capu::SmartPointer<EtchPoolRunnable> runnable)
- : mPool(pool), mRunnable(runnable) {
+ : mRunnable(runnable) {
}
/**
@@ -57,7 +57,6 @@ public:
}
private:
- EtchFreePool* mPool;
capu::SmartPointer<EtchPoolRunnable> mRunnable;
};
Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp Thu Mar 20 10:42:46 2014
@@ -29,7 +29,7 @@ public:
* Create a new instance of EtchFreePoolRunnable class.
*/
EtchQueuedPoolRunnable(EtchQueuedPool* pool, capu::SmartPointer<EtchPoolRunnable> runnable)
- : mPool(pool), mRunnable(runnable) {
+ : mRunnable(runnable) {
}
/**
@@ -55,7 +55,6 @@ public:
}
private:
- EtchQueuedPool* mPool;
capu::SmartPointer<EtchPoolRunnable> mRunnable;
};
Modified: etch/trunk/binding-cpp/runtime/src/main/transport/EtchFlexBuffer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/transport/EtchFlexBuffer.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchFlexBuffer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchFlexBuffer.cpp Thu Mar 20 10:42:46 2014
@@ -166,12 +166,15 @@ status_t EtchFlexBuffer::get(capu::int8_
capu::int32_t n = 0;
- if (len - off < getAvailableBytes()) {
- if (len - off < 0)
+ if ((signed)(len - off) < static_cast<capu::int32_t>(getAvailableBytes())) {
+ if ((signed)(len - off) < 0) {
return ETCH_EINVAL;
+ }
n = len - off;
- } else
+ } else {
n = getAvailableBytes();
+ }
+
numBytes = n;
memcpy(buf, &mBuffer[mIndex], n);
mIndex += n;
Modified: etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchPacketizer.cpp Thu Mar 20 10:42:46 2014
@@ -24,8 +24,8 @@ const capu::uint32_t& EtchPacketizer::HE
return headerSize;
}
-const capu::int32_t& EtchPacketizer::SIG() {
- static const capu::int32_t sig(0xdeadbeef);
+const capu::uint32_t& EtchPacketizer::SIG() {
+ static const capu::uint32_t sig(0xDEADBEEFu);
return sig;
}
Modified: etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp Thu Mar 20 10:42:46 2014
@@ -135,7 +135,7 @@ status_t EtchTcpConnection::openSocket(c
if (mSocket->connect((capu::char_t*) mHost.c_str(), mPort) == ETCH_OK) {
mMutexConnection.unlock();
capu::char_t* remoteAddress = NULL;
- status_t result = mSocket->getRemoteAddress(&remoteAddress);
+ mSocket->getRemoteAddress(&remoteAddress);
ETCH_LOG_DEBUG(mRuntime->getLogger(), mRuntime->getLogger().getTransportContext(), mHost.c_str() << ":" << mPort << " => Connection established to remote " << remoteAddress);
delete[] remoteAddress;
Modified: etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp Thu Mar 20 10:42:46 2014
@@ -150,7 +150,7 @@ status_t EtchTcpListener::readSocket() {
break;
if (mSession != NULL) {
capu::char_t* remoteAddress = NULL;
- status_t result = s->getRemoteAddress(&remoteAddress);
+ s->getRemoteAddress(&remoteAddress);
ETCH_LOG_DEBUG(mRuntime->getLogger(), mRuntime->getLogger().getTransportContext(), "A new connection from " << remoteAddress << " has been accepted");
delete[] remoteAddress;
mSession->sessionAccepted(s);
Modified: etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp Thu Mar 20 10:42:46 2014
@@ -62,7 +62,6 @@ status_t EtchTcpTransportFactory::newTra
//TODO : secure communication via ssl sockets
return ETCH_EUNIMPL;
} else {
- // TODO add runtime
c = new EtchTcpConnection(mRuntime, (EtchSocket*) socket, &u);
}
stack->setTransportData(c);
@@ -99,15 +98,15 @@ status_t EtchTcpTransportFactory::newLis
l = new EtchTcpListener(mRuntime, &u);
}
- result = new MySessionListener(mRuntime, this, l, uri, resources, mIsSecure);
+ result = new MySessionListener(mRuntime, this, l, uri, resources);
if (result == NULL) {
return ETCH_ERROR;
}
return ETCH_OK;
}
-EtchTcpTransportFactory::MySessionListener::MySessionListener(EtchRuntime* runtime, EtchTcpTransportFactory* factory, EtchTransport<EtchSessionListener<EtchSocket> > *transport, EtchString uri, EtchResources* resources, capu::bool_t secure)
-: mRuntime(runtime), mFactory(factory), mTransport(transport), mUri(uri), mResources(resources), mIsSecure(secure) {
+EtchTcpTransportFactory::MySessionListener::MySessionListener(EtchRuntime* runtime, EtchTcpTransportFactory* factory, EtchTransport<EtchSessionListener<EtchSocket> > *transport, EtchString uri, EtchResources* resources)
+: mRuntime(runtime), mFactory(factory), mTransport(transport), mUri(uri), mResources(resources) {
if (mTransport != NULL) {
mTransport->setSession(this);
}
@@ -119,6 +118,7 @@ EtchServerFactory* EtchTcpTransportFacto
}
EtchTcpTransportFactory::MySessionListener::~MySessionListener() {
+
if(mTransport != NULL) {
delete mTransport;
}
Modified: etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/support/EtchRuntimeTest.cpp Thu Mar 20 10:42:46 2014
@@ -22,7 +22,10 @@
class MockLogAppender : public IEtchLogAppender {
public:
+ virtual ~MockLogAppender() {};
+
MOCK_METHOD1(log, void(const capu::LogMessage& message));
+
};
capu::uint64_t currentIdCount;
Modified: etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp?rev=1579585&r1=1579584&r2=1579585&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/transport/EtchPacketizerTest.cpp Thu Mar 20 10:42:46 2014
@@ -156,16 +156,16 @@ public:
capu::uint32_t val;
buf->getInteger(val);
- EXPECT_EQ(11, val);
+ EXPECT_EQ(11u, val);
buf->getInteger(val);
- EXPECT_EQ(1122, val);
+ EXPECT_EQ(1122u, val);
buf->getInteger(val);
- EXPECT_EQ(112233, val);
+ EXPECT_EQ(112233u, val);
buf->getInteger(val);
- EXPECT_EQ(11223344, val);
+ EXPECT_EQ(11223344u, val);
return ETCH_OK;
}