etch-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vei...@apache.org
Subject svn commit: r1460566 [2/3] - in /etch/trunk: binding-cpp/compiler/src/main/resources/org/apache/etch/bindings/cpp/compiler/ binding-cpp/runtime/ binding-cpp/runtime/include/common/ binding-cpp/runtime/include/serialization/ binding-cpp/runtime/include/...
Date Mon, 25 Mar 2013 09:43:46 GMT
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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorByte.cpp Mon Mar 25 09:43:41 2013
@@ -55,17 +55,17 @@ capu::bool_t EtchValidatorByte::validate
 
   if (value->getObjectType()->equals(EtchShort::TYPE())) {
     EtchShort *v = (EtchShort *) value.get();
-    return ((v->get() >= capu::NumericLimitMin<capu::int8_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t > ()));
+    return ((v->get() >= capu::NumericLimits::Min<capu::int8_t > ()) && (v->get() <= capu::NumericLimits::Max<capu::int8_t > ()));
   }
 
   if (value->getObjectType()->equals(EtchInt32::TYPE())) {
     EtchInt32 *v = (EtchInt32 *) value.get();
-    return ((v->get() >= capu::NumericLimitMin<capu::int8_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t > ()));
+    return ((v->get() >= capu::NumericLimits::Min<capu::int8_t > ()) && (v->get() <= capu::NumericLimits::Max<capu::int8_t > ()));
   }
 
   if (value->getObjectType()->equals(EtchLong::TYPE())) {
     EtchLong *v = (EtchLong *) value.get();
-    return ((v->get() >= capu::NumericLimitMin<capu::int8_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int8_t > ()));
+    return ((v->get() >= capu::NumericLimits::Min<capu::int8_t > ()) && (v->get() <= capu::NumericLimits::Max<capu::int8_t > ()));
   }
   //array handling
   if ((value->getObjectType()->isArray()) && (mExpectedType->isArray())) {

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorCustom.cpp Mon Mar 25 09:43:41 2013
@@ -27,7 +27,7 @@ public:
    * Validator cache
    */
   struct ValidatorCache {
-    ValidatorCache() : id(0), validators(ETCH_DEFAULT_CUSTOMVALIDATORCACHE_HASH_SIZE) {}
+    ValidatorCache() : id(0), validators(ETCH_DEFAULT_CUSTOMVALIDATORCACHE_HASH_BIT_SIZE) {}
     capu::uint64_t id;
     EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> > validators;
   };
@@ -42,7 +42,7 @@ public:
    * Destructor
    */
   virtual ~EtchValidatorCustomCaches() {
-    capu::List<ValidatorCache*>::Iterator iter = mValidatorsCache.begin();
+    EtchList<ValidatorCache*>::Iterator iter = mValidatorsCache.begin();
     while(iter.hasNext()) {
       ValidatorCache* entry = NULL;
       iter.next(&entry);
@@ -56,7 +56,7 @@ public:
   }
 
   EtchHashTable<EtchValidatorCustomKey, capu::SmartPointer<EtchValidator> >& get(EtchRuntime* runtime) {
-    capu::List<ValidatorCache*>::Iterator iter = mValidatorsCache.begin();
+    EtchList<ValidatorCache*>::Iterator iter = mValidatorsCache.begin();
     while(iter.hasNext()) {
       ValidatorCache* entry = NULL;
       iter.next(&entry);
@@ -71,7 +71,7 @@ public:
   }
 
 private:
-  capu::List<ValidatorCache*> mValidatorsCache;
+  EtchList<ValidatorCache*> mValidatorsCache;
 };
 
 

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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorInt.cpp Mon Mar 25 09:43:41 2013
@@ -60,7 +60,7 @@ capu::bool_t EtchValidatorInt::validate(
 
   if (value->getObjectType()->equals(EtchLong::TYPE())) {
     EtchLong *v = (EtchLong *) value.get();
-    return ((v->get() >= capu::NumericLimitMin<capu::int32_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int32_t > ()));
+    return ((v->get() >= capu::NumericLimits::Min<capu::int32_t > ()) && (v->get() <= capu::NumericLimits::Max<capu::int32_t > ()));
   }
 
   //handle array

Modified: etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/serialization/EtchValidatorShort.cpp Mon Mar 25 09:43:41 2013
@@ -59,12 +59,12 @@ capu::bool_t EtchValidatorShort::validat
 
   if (value->getObjectType()->equals(EtchInt32::TYPE())) {
     EtchInt32 *v = (EtchInt32 *) value.get();
-    return ((v->get() >= capu::NumericLimitMin<capu::int16_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int16_t > ()));
+    return ((v->get() >= capu::NumericLimits::Min<capu::int16_t > ()) && (v->get() <= capu::NumericLimits::Max<capu::int16_t > ()));
   }
 
   if (value->getObjectType()->equals(EtchLong::TYPE())) {
     EtchLong *v = (EtchLong *) value.get();
-    return ((v->get() >= capu::NumericLimitMin<capu::int16_t > ()) && (v->get() <= capu::NumericLimitMax<capu::int16_t > ()));
+    return ((v->get() >= capu::NumericLimits::Min<capu::int16_t > ()) && (v->get() <= capu::NumericLimits::Max<capu::int16_t > ()));
   }
 
   if ((value->getObjectType()->isArray()) && (mExpectedType->isArray())) {

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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchFreePool.cpp Mon Mar 25 09:43:41 2013
@@ -19,6 +19,7 @@
 #include "support/EtchFreePool.h"
 
 #include "capu/os/Thread.h"
+#include "capu/util/Runnable.h"
 #include "capu/os/Memory.h"
 #include "capu/util/Runnable.h"
 
@@ -53,7 +54,6 @@ public:
         }
       }
     }
-    delete this;
   }
 
 private:
@@ -71,10 +71,13 @@ EtchFreePool::EtchFreePool(capu::int32_t
   addObjectType(TYPE());
   mThreads = new capu::Thread*[mSizeMax];
   capu::Memory::Set(mThreads, 0, sizeof(capu::Thread*)*mSizeMax);
+  mRunnables = new EtchFreePoolRunnable*[mSizeMax];
+  capu::Memory::Set(mRunnables, 0, sizeof(EtchFreePoolRunnable*)*mSizeMax);
 }
 
 EtchFreePool::~EtchFreePool() {
   delete[] mThreads;
+  delete[] mRunnables;
 }
 
 status_t EtchFreePool::close() {
@@ -98,7 +101,9 @@ status_t EtchFreePool::join() {
     if(mThreads[i] != NULL) {
       mThreads[i]->join();
       delete mThreads[i];
+      delete mRunnables[i];
       mThreads[i] = NULL;
+      mRunnables[i] = NULL;
     }
   }
   mMutex.unlock();
@@ -124,13 +129,14 @@ status_t EtchFreePool::add(capu::SmartPo
     return ETCH_ERROR;
   }
 
-  EtchFreePoolRunnable* tmp = new EtchFreePoolRunnable(this, runnable);
-  capu::Thread* thread = new capu::Thread(tmp);
-  thread->start();
+  EtchFreePoolRunnable *tmp = new EtchFreePoolRunnable(this, runnable);
+  capu::Thread* thread = new capu::Thread();
+  thread->start(*tmp);
 
   for(capu::int32_t i = 0; i < mSizeMax; i++) {
     if(mThreads[i] == NULL) {
       mThreads[i] = thread;
+      mRunnables[i] = tmp;
       mSize++;
       mMutex.unlock();
       return ETCH_OK;
@@ -149,6 +155,11 @@ status_t EtchFreePool::check() {
       if(capu::TS_TERMINATED == state) {
         delete mThreads[i];
         mThreads[i] = NULL;
+
+        if (mRunnables[i] != NULL) {
+          delete mRunnables[i];
+          mRunnables[i] = NULL;
+        }
         mSize--;
       }
     }

Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchMonitor.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchMonitor.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchMonitor.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchMonitor.cpp Mon Mar 25 09:43:41 2013
@@ -60,7 +60,7 @@ status_t EtchMonitor::waitUntilEqAndSet(
 
 status_t EtchMonitor::waitUntilEqIntern(const EtchString& desiredValue, capu::int32_t maxDelay) {
   capu::uint64_t now = capu::Time::GetMilliseconds();
-  capu::uint64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::uint32_t>();
+  capu::uint64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimits::Max<capu::int64_t>();
 
   capu::int64_t d = end - now;
   while (!eq(mValue, desiredValue) && d > 0) {
@@ -117,7 +117,7 @@ status_t EtchMonitor::waitUntilNotEq(con
 
 status_t EtchMonitor::waitUntilNotEqIntern(const EtchString& undesiredValue, capu::uint32_t maxDelay, EtchString& current) {
   capu::uint64_t now = capu::Time::GetMilliseconds();
-  capu::uint64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::uint32_t>();
+  capu::uint64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimits::Max<capu::int64_t>();
 
   capu::int64_t d = end - now;
   while (eq(mValue, undesiredValue) && d > 0) {

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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchQueuedPool.cpp Mon Mar 25 09:43:41 2013
@@ -80,7 +80,7 @@ status_t EtchQueuedPool::close() {
 }
 
 status_t EtchQueuedPool::join() {
-  mPool->join();
+  mPool->close();
   return ETCH_OK;
 }
 

Modified: etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/support/EtchRuntime.cpp Mon Mar 25 09:43:41 2013
@@ -46,7 +46,7 @@ status_t EtchRuntime::registerListener(E
   }
 
   mMutex.lock();
-  mListeners.add(listener);
+  mListeners.insert(listener);
   mMutex.unlock();
   return ETCH_OK;
 }
@@ -56,7 +56,7 @@ status_t EtchRuntime::unregisterListener
   mMutex.lock();
   capu::int_t index = mListeners.find(listener);
   if(index != -1) {
-    mListeners.removeAt(index);
+    mListeners.erase(index);
     status = ETCH_OK;
   } else {
     status = ETCH_ERROR;
@@ -81,9 +81,9 @@ status_t EtchRuntime::fireOnRuntimeChang
   mMutex.lock();
 
   capu::List<EtchRuntimeListener*>::Iterator iter = mListeners.begin();
-  while(iter.hasNext()) {
-    EtchRuntimeListener* listener = NULL;
-    iter.next(&listener);
+  while(iter != mListeners.end()) {
+    EtchRuntimeListener* listener = *iter;
+    iter++;
     listener->onRuntimeChanged(this);
   }
   mMutex.unlock();

Modified: etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchPlainMailboxManager.cpp Mon Mar 25 09:43:41 2013
@@ -20,19 +20,19 @@
 #include "capu/os/Debug.h"
 
 EtchPlainMailboxManager::EtchPlainMailboxManager(EtchRuntime* runtime, EtchTransportMessage* transport, const EtchString& uri, EtchResources* resources)
-: mRuntime(runtime), mSession(NULL), mTransport(transport), mUp(false), mMailboxes(ETCH_DEFAULT_MAILBOXMANAGER_HASH_SIZE) {
+: mRuntime(runtime), mSession(NULL), mTransport(transport), mUp(false), mMailboxes(ETCH_DEFAULT_MAILBOXMANAGER_HASH_BIT_SIZE) {
   capu::Debug::Assert(mRuntime != NULL);
   mTransport->setSession(this);
 }
 
 EtchPlainMailboxManager::~EtchPlainMailboxManager() {
   EtchHashTable<EtchLong, EtchMailbox*>::Iterator it = mMailboxes.begin();
-  EtchHashTable<EtchLong, EtchMailbox*>::Pair p;
+  EtchHashTable<EtchLong, EtchMailbox*>::HashTableEntry entry;
   // TODO check thread safety
   while (it.hasNext()) {
-    it.next(&p);
-    p.second->closeDelivery();
-    delete p.second;
+    it.next(&entry);
+    entry.value->closeDelivery();
+    delete entry.value;
   }
 }
 
@@ -180,11 +180,11 @@ status_t EtchPlainMailboxManager::sessio
     mUp = false;
     // TODO check thread safety
     EtchHashTable<EtchLong, EtchMailbox*>::Iterator it = mMailboxes.begin();
-    EtchHashTable<EtchLong, EtchMailbox*>::Pair p;
+    EtchHashTable<EtchLong, EtchMailbox*>::HashTableEntry entry;
     while (it.hasNext()) {
-      it.next(&p);
-      p.second->closeDelivery();
-      delete p.second;
+      it.next(&entry);
+      entry.value->closeDelivery();
+      delete entry.value;
     }
     CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchPlainMailboxManager", "Connection is down");
   }

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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpConnection.cpp Mon Mar 25 09:43:41 2013
@@ -54,7 +54,7 @@ EtchTcpConnection::~EtchTcpConnection() 
 status_t EtchTcpConnection::send(capu::int8_t* buf, capu::uint32_t off, capu::uint32_t len) {
   if (mSocket != NULL) {
     CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpConnection", "%d byte of data has been transmitted", len);
-    return mSocket->send((unsigned char *) &buf[off], len);
+    return mSocket->send((capu::char_t*)&buf[off], len);
   }
   CAPU_LOG_WARN(mRuntime->getLogger(), "EtchTcpConnection", "%d byte of data has not been transmitted because there is no connection", len);
   return ETCH_ERROR;
@@ -65,7 +65,7 @@ status_t EtchTcpConnection::readSocket()
 
   while (mIsStarted) {
     capu::int32_t n;
-    status_t result = mSocket->receive((unsigned char *) buf->getBuffer(), buf->getSize(), n);
+    status_t result = mSocket->receive((capu::char_t*)buf->getBuffer(), buf->getSize(), n);
     if (result != ETCH_OK) {
       CAPU_LOG_ERROR(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Receive() failed with error code %d", mHost.c_str(), mPort, result);
       return result;
@@ -126,7 +126,7 @@ status_t EtchTcpConnection::openSocket(c
     if (mSocket == NULL) {
       mSocket = new EtchSocket();
     }
-    if (mSocket->connect((unsigned char *) mHost.c_str(), mPort) == ETCH_OK) {
+    if (mSocket->connect((capu::char_t*) mHost.c_str(), mPort) == ETCH_OK) {
       mMutexConnection.unlock();
       CAPU_LOG_TRACE(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Connection established", mHost.c_str(), mPort);
       return ETCH_OK;
@@ -167,8 +167,8 @@ status_t EtchTcpConnection::transportCon
     }
     mIsStarted = true;
     mMutex.unlock();
-    mThread = new capu::Thread(this);
-    mThread->start();
+    mThread = new capu::Thread();
+    mThread->start(*this);
     CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Start command received and EtchTcpConnection Receiving Thread has started", mHost.c_str(), mPort);
     return ETCH_OK;
   }
@@ -182,8 +182,8 @@ status_t EtchTcpConnection::transportCon
     }
     mIsStarted = true;
     mMutex.unlock();
-    mThread = new capu::Thread(this);
-    mThread->start();
+    mThread = new capu::Thread();
+    mThread->start(*this);
     CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpConnection", "%s : %d => Start and wait command received and EtchTcpConnection Receiving Thread has started", mHost.c_str(), mPort);
     return waitUp(((EtchInt32*) value.get())->get());
   }

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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpListener.cpp Mon Mar 25 09:43:41 2013
@@ -168,12 +168,12 @@ status_t EtchTcpListener::transportContr
     mMutex.lock();
     mIsStarted = true;
     mMutex.unlock();
-    mThread = new capu::Thread(this);
+    mThread = new capu::Thread();
+    mThread->start(*this);
     mConnectionChecker = new ConnectionChecker(this);
-    mConnectionCheckerThread = new capu::Thread(mConnectionChecker);
-    mThread->start();
+    mConnectionCheckerThread = new capu::Thread();
+    mConnectionCheckerThread->start(*mConnectionChecker);
     CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpListener", "Start command received and EtchTcpListener starts listening on port %d", mPort);
-    mConnectionCheckerThread->start();
     return ETCH_OK;
   }
 
@@ -185,12 +185,12 @@ status_t EtchTcpListener::transportContr
     mMutex.lock();
     mIsStarted = true;
     mMutex.unlock();
-    mThread = new capu::Thread(this);
+    mThread = new capu::Thread();
+    mThread->start(*this);
     mConnectionChecker = new ConnectionChecker(this);
-    mConnectionCheckerThread = new capu::Thread(mConnectionChecker);
-    mThread->start();
+    mConnectionCheckerThread = new capu::Thread();
+    mConnectionCheckerThread->start(*mConnectionChecker);
     CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpListener", "Start and wait up command received and EtchTcpListener starts listening on port %d", mPort);
-    mConnectionCheckerThread->start();
     return waitUp(((EtchInt32*) value.get())->get());
   }
 
@@ -231,7 +231,8 @@ status_t EtchTcpListener::transportContr
     close();
     mThread->join();
     mIsStarted = true;
-    mThread = new capu::Thread(this);
+    mThread = new capu::Thread();
+    mThread->start(*this);
     CAPU_LOG_DEBUG(mRuntime->getLogger(), "EtchTcpListener", "Reset command received and EtchTcpListener has been restarted the stop flag");
     return ETCH_OK;
   }

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=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/transport/EtchTcpTransportFactory.cpp Mon Mar 25 09:43:41 2013
@@ -113,7 +113,7 @@ EtchTcpTransportFactory::MySessionListen
   if (mTransport != NULL) {
     mTransport->setSession(this);
   }
-  mConnectionStacks = new capu::List<EtchStack*>();
+  mConnectionStacks = new EtchList<EtchStack*>();
 }
 
 EtchServerFactory* EtchTcpTransportFactory::MySessionListener::getSession() {
@@ -131,7 +131,7 @@ EtchTcpTransportFactory::MySessionListen
     EtchTransportHelper::DestroyResources(mRuntime, mResources);
   }
 
-  capu::List<EtchStack*>::Iterator it = mConnectionStacks->begin();
+  EtchList<EtchStack*>::Iterator it = mConnectionStacks->begin();
   while (it.hasNext()) {
     EtchStack* st = NULL;
     it.next(&st);
@@ -169,10 +169,10 @@ status_t EtchTcpTransportFactory::MySess
 status_t EtchTcpTransportFactory::MySessionListener::sessionNotify(capu::SmartPointer<EtchObject> event) {
   if (event->equals(&EtchTcpListener::CONNECTION_CHECK())) {
     //go through the list of connection and check if the connection is still dead and we have to clean the stack up
-    capu::List<EtchStack*>::Iterator it = mConnectionStacks->begin();
+    EtchList<EtchStack*>::Iterator it = mConnectionStacks->begin();
     while (it.hasNext()) {
       EtchStack* stack = NULL;
-      status_t res = it.current(&stack);
+      status_t res = it.current(stack);
       if (res == ETCH_OK) {
         EtchTcpConnection* con = (EtchTcpConnection*) stack->getTransportData();
         if (con != NULL) {

Modified: etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/util/EtchCircularQueue.cpp Mon Mar 25 09:43:41 2013
@@ -125,7 +125,7 @@ status_t EtchCircularQueue::get(EtchMail
 
   // the queue is empty, not closed, and caller has requested a delay...
   capu::int64_t now = capu::Time::GetMilliseconds();
-  capu::int64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::uint32_t>();
+  capu::int64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimits::Max<capu::int64_t>();
 
   capu::int64_t d;
   while ((d = end - now) > 0) {
@@ -191,8 +191,8 @@ capu::status_t EtchCircularQueue::put(Et
   }
 
   // the queue is full, not closed, and the caller has requested a delay...
-  capu::uint64_t now = capu::Time::GetMilliseconds();
-  capu::uint64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimitMax<capu::uint32_t>();
+  capu::int64_t now = capu::Time::GetMilliseconds();
+  capu::int64_t end = (maxDelay > 0) ? now + maxDelay : capu::NumericLimits::Max<capu::int64_t>();
 
   capu::int64_t d;
   while((d = end - now) > 0) {

Modified: etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/util/EtchResources.cpp Mon Mar 25 09:43:41 2013
@@ -19,7 +19,7 @@
 #include "util/EtchResources.h"
 
 EtchResources::EtchResources()
-: mRelated(NULL), mRes(ETCH_DEFAULT_RESOURCES_HASH_SIZE) {
+: mRelated(NULL), mRes(ETCH_DEFAULT_RESOURCES_HASH_BIT_SIZE) {
 
 }
 

Modified: etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/util/EtchURL.cpp Mon Mar 25 09:43:41 2013
@@ -19,7 +19,7 @@
 #include "capu/os/StringUtils.h"
 
 EtchURL::EtchURL()
- : terms(ETCH_DEFAULT_URL_TERMS_HASH_SIZE) {
+ : terms(ETCH_DEFAULT_URL_TERMS_HASH_BIT_SIZE) {
 
 }
 

Modified: etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/main/util/EtchUtil.cpp Mon Mar 25 09:43:41 2013
@@ -48,7 +48,7 @@ status_t etch_strcpy_s(char *dst, size_t
   }
 }
 
-status_t etch_strlen_utf8(const char *src, capu::int32_t &length) {
+status_t etch_strlen_utf8(const char *src, capu::uint32_t &length) {
   if (src == NULL)
     return ETCH_EINVAL;
   length = 0;

Modified: etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/common/EtchFloatTest.cpp Mon Mar 25 09:43:41 2013
@@ -62,7 +62,7 @@ TEST(EtchFloatTest, equals){
 }
 
 TEST(EtchFloatTest, copyTest) {
-  EtchFloat o1(2.123);
+  EtchFloat o1(static_cast<capu::float_t>(2.123));
   EtchFloat o2(o1);
   EtchFloat o3 = o2;
   EXPECT_TRUE(o1.equals(&o2));
@@ -70,7 +70,7 @@ TEST(EtchFloatTest, copyTest) {
 }
 
 TEST(EtchFloatTest, isInstanceOf) {
-  EtchObject* o1 = new EtchFloat(2.123);
+  EtchObject* o1 = new EtchFloat(static_cast<capu::float_t>(2.123));
   EXPECT_TRUE(o1->isInstanceOf(EtchObject::TYPE()));
   EXPECT_TRUE(o1->isInstanceOf(EtchFloat::TYPE()));
   EXPECT_FALSE(o1->isInstanceOf(EtchString::TYPE()));

Modified: etch/trunk/binding-cpp/runtime/src/test/common/EtchHashSetTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/common/EtchHashSetTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/common/EtchHashSetTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/common/EtchHashSetTest.cpp Mon Mar 25 09:43:41 2013
@@ -20,15 +20,15 @@
 
 #include "common/EtchError.h"
 #include "common/EtchHashSet.h"
-#include "common/EtchHashNative.h"
 #include "common/EtchComparatorNative.h"
+#include "common/EtchHashNative.h"
 #include "common/EtchString.h"
 
 TEST(EtchHashSet, Constructor_Default){
   EtchHashSet<EtchString>* set = new EtchHashSet<EtchString > ();
   delete set;
 
-  EtchHashSet<char*, EtchHashNative, EtchComparatorNative >* set2 = new EtchHashSet<char*, EtchHashNative, EtchComparatorNative > ();
+  EtchHashSet<char*, EtchComparatorNative, EtchHashNative >* set2 = new EtchHashSet<char*, EtchComparatorNative, EtchHashNative > ();
   delete set2;
 }
 
@@ -51,7 +51,7 @@ TEST(EtchHashSet, put){
   status = h1->put(value2);
   EXPECT_TRUE(status == ETCH_ERROR);
 
-  EtchHashSet<char*, EtchHashNative, EtchComparatorNative >* h2 = new EtchHashSet<char*, EtchHashNative, EtchComparatorNative > ();
+  EtchHashSet<char*, EtchComparatorNative, EtchHashNative >* h2 = new EtchHashSet<char*, EtchComparatorNative, EtchHashNative > ();
 
   // add new key
   char* value3 = const_cast<char*>("val1");
@@ -211,9 +211,8 @@ TEST(EtchHashSetIterator, NEXT){
   it = h1->begin();
 
   it.next(&check_value);
-  EXPECT_TRUE(check_value.equals(&value));
-
   it.next(&check_value);
-  EXPECT_TRUE(check_value.equals(&value2));
+  EXPECT_EQ(ETCH_ERANGE,it.next());
+
   delete h1;
 }

Modified: etch/trunk/binding-cpp/runtime/src/test/common/EtchHashTableTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/common/EtchHashTableTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/common/EtchHashTableTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/common/EtchHashTableTest.cpp Mon Mar 25 09:43:41 2013
@@ -18,8 +18,8 @@
 
 #include <gtest/gtest.h>
 #include "common/EtchHashTable.h"
-#include "common/EtchHashNative.h"
 #include "common/EtchComparatorNative.h"
+#include "common/EtchHashNative.h"
 #include "common/EtchInt32.h"
 #include "common/EtchString.h"
 
@@ -27,7 +27,7 @@ TEST(EtchHashTableTest, Constructor_Defa
   EtchHashTable<EtchString, EtchInt32>* h1 = new EtchHashTable<EtchString, EtchInt32 > ();
   delete h1;
 
-  EtchHashTable<char*, capu::int32_t, EtchHashNative, EtchComparatorNative >* h2 = new EtchHashTable<char*, capu::int32_t, EtchHashNative, EtchComparatorNative > ();
+  EtchHashTable<char*, capu::int32_t, EtchComparatorNative, EtchHashNative >* h2 = new EtchHashTable<char*, capu::int32_t, EtchComparatorNative, EtchHashNative > ();
   delete h2;
 }
 
@@ -45,7 +45,7 @@ TEST(EtchHashTableTest, put){
   count = h1->count();
   EXPECT_TRUE(count == 1);
 
-  EtchHashTable<char*, capu::int32_t, EtchHashNative, EtchComparatorNative >* h2 = new EtchHashTable<char*, capu::int32_t, EtchHashNative, EtchComparatorNative > ();
+  EtchHashTable<char*, capu::int32_t, EtchComparatorNative, EtchHashNative >* h2 = new EtchHashTable<char*, capu::int32_t, EtchComparatorNative, EtchHashNative> ();
   // add new key
   char* key1 = const_cast<char*>("key1");
   capu::int32_t value1 = 5;
@@ -90,8 +90,7 @@ TEST(EtchHashTableTest, get){
   EtchInt32 return_value(-1);
   capu::uint64_t count = 5;
 
-  EtchHashTable<EtchString, EtchInt32>* h1 =
-          new EtchHashTable<EtchString, EtchInt32 > ();
+  EtchHashTable<EtchString, EtchInt32>* h1 = new EtchHashTable<EtchString, EtchInt32 > ();
   // add new key
   status = h1->put(key, value);
   EXPECT_TRUE(status == ETCH_OK);
@@ -111,7 +110,7 @@ TEST(EtchHashTableTest, get){
   status = h1->get(key2, &return_value);
   EXPECT_TRUE(status == ETCH_ENOT_EXIST);
 
-  EtchHashTable<char*, capu::int32_t, EtchHashNative, EtchComparatorNative >* h2 = new EtchHashTable<char*, capu::int32_t, EtchHashNative, EtchComparatorNative > ();
+  EtchHashTable<char*, capu::int32_t, EtchComparatorNative, EtchHashNative >* h2 = new EtchHashTable<char*, capu::int32_t, EtchComparatorNative, EtchHashNative > ();
   // add new key
   char* key1 = const_cast<char*>("key1");
   capu::int32_t value1 = 5;
@@ -122,7 +121,7 @@ TEST(EtchHashTableTest, get){
   status = h2->get(key1, &return_value1);
   EXPECT_TRUE(status == ETCH_OK);
   //check its value
-  EXPECT_TRUE(return_value.get() == value.get());
+  EXPECT_TRUE(return_value1 == value1);
 
   delete h1;
   delete h2;
@@ -269,13 +268,12 @@ TEST(EtchHashTableIterator, NEXT){
 
   EtchHashTable<EtchString, EtchInt32>* h1 = new EtchHashTable<EtchString, EtchInt32 > ();
 
-  EtchHashTable<EtchString, EtchInt32>::Pair pair;
   //create iterator
   EtchHashTable<EtchString, EtchInt32>::Iterator it = h1->begin();
   //check hasNext
   EXPECT_TRUE(it.hasNext() == false);
-
-  EXPECT_TRUE(it.next(&pair) == ETCH_ERANGE);
+  EtchHashTable<EtchString, EtchInt32>::HashTableEntry entry;
+  EXPECT_TRUE(it.next(&entry) == ETCH_ERANGE);
 
   // add new keys
   status = h1->put(key, value);
@@ -287,13 +285,9 @@ TEST(EtchHashTableIterator, NEXT){
 
   it = h1->begin();
 
-  it.next(&pair);
-  EXPECT_TRUE(strcmp(pair.first.c_str(), key.c_str()) == 0);
-  EXPECT_TRUE(pair.second.get() == value.get());
-
-  it.next(&pair);
-  EXPECT_TRUE(strcmp(pair.first.c_str(), key2.c_str()) == 0);
-  EXPECT_TRUE(pair.second.get() == value.get());
+  EXPECT_EQ(ETCH_OK, it.next(&entry));
+  EXPECT_EQ(ETCH_OK, it.next(&entry));
+  EXPECT_EQ(ETCH_ERANGE, it.next(&entry));
 
   delete h1;
 }

Modified: etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/common/EtchListTest.cpp Mon Mar 25 09:43:41 2013
@@ -59,6 +59,7 @@ TEST(EtchList, removeAt) {
   EtchInt32 data1;
   EtchInt32 data2;
   EtchInt32 data3;
+  EtchInt32 data4;
   status_t result;
 
   data1.set(32);
@@ -68,28 +69,28 @@ TEST(EtchList, removeAt) {
   result = list->add(data1);
   EXPECT_TRUE(result == ETCH_OK);
 
-  result = list->add(data3);
-  EXPECT_TRUE(result == ETCH_OK);
-
   result = list->add(data2);
   EXPECT_TRUE(result == ETCH_OK);
 
-  //removing element at index 1
-  result = list->removeAt(1);
+  result = list->add(data3);
   EXPECT_TRUE(result == ETCH_OK);
 
-  //removing element at index 1
-  result = list->removeAt(1);
+  EtchList<EtchInt32>::Iterator it = list->begin();
+
+  result = list->removeAt(it, &data4);
   EXPECT_TRUE(result == ETCH_OK);
+  EXPECT_TRUE(data4.get() == data1.get());
 
-  //removing element at index 0 (HEAD)
-  result = list->removeAt(0, &data1);
+  result = list->removeAt(it, &data4);
   EXPECT_TRUE(result == ETCH_OK);
-  EXPECT_TRUE(data1.get() == 32);
+  EXPECT_TRUE(data4.get() == data2.get());
 
-  //remove element from out of index
-  result = list->removeAt(1000);
-  EXPECT_TRUE(result == ETCH_EINVAL);
+  result = list->removeAt(it, &data4);
+  EXPECT_TRUE(result == ETCH_OK);
+  EXPECT_TRUE(data4.get() == data3.get());
+  
+  EXPECT_FALSE(it.hasNext());
+  EXPECT_EQ(ETCH_ERROR, it.next());
 
   //check size of list
   EXPECT_TRUE(list->size() == 0);

Modified: etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/common/EtchStringTest.cpp Mon Mar 25 09:43:41 2013
@@ -146,16 +146,6 @@ TEST(EtchStringTest, UTF8_Constructor_De
   delete s1;
 }
 
-TEST(EtchStringTest, UTF8_Assignment_Test) {
-  const capu::uint8_t utf8 [] = {0xF0, 0xA4, 0xAD, 0xA2, 0xE2, 0x82, 0xAC, 0xC2, 0xA2, 0x24};
-  EtchString* s1 = new EtchString(NULL, 0, "utf-8");
-  *s1 = (const char*)utf8;
-  EXPECT_TRUE(s1->c_str() != NULL);
-  EXPECT_TRUE(strncmp(s1->c_str(), (const char*)utf8, 10) == 0);
-  delete s1;
-}
-//
-
 TEST(EtchStringTest, UTF8_len_test) {
   const capu::uint8_t utf8 [] = {0xF0, 0xA4, 0xAD, 0xA2, 0xE2, 0x82, 0xAC, 0xC2, 0xA2, 0x24};
   EtchString *s = new EtchString((capu::int8_t*)utf8, 10, "utf-8");

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchBinaryTaggedDataInputOutputTest.cpp Mon Mar 25 09:43:41 2013
@@ -105,32 +105,32 @@ public:
   static capu::int32_t* testInt() {
     capu::int32_t n = 65536 + 2 + 2;
     capu::int32_t k = 65536 + 2;
-    capu::int32_t min = capu::NumericLimitMin<capu::int16_t > () - 1;
+    capu::int32_t min = capu::NumericLimits::Min<capu::int16_t > () - 1;
     capu::int32_t *vals = new capu::int32_t[n];
     capu::int32_t i = 0;
     while (k > 0) {
       vals[i++] = min++;
       k--;
     }
-    vals[i++] = capu::NumericLimitMin<capu::int32_t > ();
-    vals[i++] = capu::NumericLimitMax<capu::int32_t > ();
+    vals[i++] = capu::NumericLimits::Min<capu::int32_t > ();
+    vals[i++] = capu::NumericLimits::Max<capu::int32_t > ();
     return vals;
   }
 
   static capu::int64_t* testLong() {
     capu::int32_t n = 65536 + 2 + 6;
     capu::int32_t k = 65536 + 2;
-    capu::int32_t min = capu::NumericLimitMin<capu::int16_t > () - 1;
+    capu::int32_t min = capu::NumericLimits::Min<capu::int16_t > () - 1;
     capu::int64_t* vals = new capu::int64_t[n];
     capu::int32_t i = 0;
     while (k > 0) {
       vals[i++] = min++;
       k--;
     }
-    vals[i++] = capu::NumericLimitMin<capu::int32_t > ();
-    vals[i++] = capu::NumericLimitMax<capu::int32_t > ();
-    vals[i++] = (capu::int64_t) capu::NumericLimitMin<capu::int32_t > () - (capu::int64_t)1L;
-    vals[i++] = (capu::int64_t) capu::NumericLimitMax<capu::int32_t > () + (capu::int64_t)1L;
+    vals[i++] = capu::NumericLimits::Min<capu::int32_t > ();
+    vals[i++] = capu::NumericLimits::Max<capu::int32_t > ();
+    vals[i++] = (capu::int64_t) capu::NumericLimits::Min<capu::int32_t > () - (capu::int64_t)1L;
+    vals[i++] = (capu::int64_t) capu::NumericLimits::Max<capu::int32_t > () + (capu::int64_t)1L;
     return vals;
   }
 
@@ -285,7 +285,7 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
   // the parking lot, you don't wanna go there.
 
   // byte values
-  for (capu::int8_t i = capu::NumericLimitMin<capu::int8_t > (); i < capu::NumericLimitMax<capu::int8_t > (); i++) {
+  for (capu::int8_t i = capu::NumericLimits::Min<capu::int8_t > (); i < capu::NumericLimits::Max<capu::int8_t > (); i++) {
     capu::SmartPointer<EtchByte> _byte = new EtchByte(i);
     if (i >= EtchTypeCode::MIN_TINY_INT && i <= EtchTypeCode::MAX_TINY_INT)
       EXPECT_TRUE(i == dataIn->checkValue(_byte));
@@ -295,11 +295,11 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
     }
   }
   // short values
-  for (capu::int16_t i = capu::NumericLimitMin<capu::int16_t > (); i < capu::NumericLimitMax<capu::int16_t > (); i++) {
+  for (capu::int16_t i = capu::NumericLimits::Min<capu::int16_t > (); i < capu::NumericLimits::Max<capu::int16_t > (); i++) {
     capu::SmartPointer<EtchShort> _short = new EtchShort(i);
     if (i >= EtchTypeCode::MIN_TINY_INT && i <= EtchTypeCode::MAX_TINY_INT)
       EXPECT_TRUE((capu::int8_t) i == dataIn->checkValue(_short));
-    else if (i >= capu::NumericLimitMin<capu::int8_t > () && i <= capu::NumericLimitMax<capu::int8_t > ()) {
+    else if (i >= capu::NumericLimits::Min<capu::int8_t > () && i <= capu::NumericLimits::Max<capu::int8_t > ()) {
       capu::int8_t var = EtchTypeCode::BYTE;
       EXPECT_TRUE(var == dataIn->checkValue(_short));
     } else {
@@ -314,10 +314,10 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
     capu::SmartPointer<EtchInt32> _int = new EtchInt32(array[i]);
     if (array[i] >= EtchTypeCode::MIN_TINY_INT && array[i] <= EtchTypeCode::MAX_TINY_INT)
       EXPECT_TRUE((capu::int8_t) array[i] == dataIn->checkValue(_int));
-    else if ((array[i] >= capu::NumericLimitMin<capu::int8_t > ()) && (array[i] <= capu::NumericLimitMax<capu::int8_t > ())) {
+    else if ((array[i] >= capu::NumericLimits::Min<capu::int8_t > ()) && (array[i] <= capu::NumericLimits::Max<capu::int8_t > ())) {
       capu::int8_t var = EtchTypeCode::BYTE;
       EXPECT_TRUE(var == dataIn->checkValue(_int));
-    } else if ((array[i] >= capu::NumericLimitMin<capu::int16_t > ()) && (array[i] <= capu::NumericLimitMax<capu::int16_t > ())) {
+    } else if ((array[i] >= capu::NumericLimits::Min<capu::int16_t > ()) && (array[i] <= capu::NumericLimits::Max<capu::int16_t > ())) {
       capu::int8_t var = EtchTypeCode::SHORT;
       EXPECT_TRUE(var == dataIn->checkValue(_int));
     } else {
@@ -333,13 +333,13 @@ TEST_F(EtchBinaryTaggedDataInputOutputTe
     capu::SmartPointer<EtchLong> _long = new EtchLong(array2[i]);
     if (array2[i] >= EtchTypeCode::MIN_TINY_INT && array2[i] <= EtchTypeCode::MAX_TINY_INT)
       EXPECT_TRUE((capu::int8_t) array2[i] == dataIn->checkValue(_long));
-    else if (array2[i] >= capu::NumericLimitMin<capu::int8_t > () && array2[i] <= capu::NumericLimitMax<capu::int8_t > ()) {
+    else if (array2[i] >= capu::NumericLimits::Min<capu::int8_t > () && array2[i] <= capu::NumericLimits::Max<capu::int8_t > ()) {
       capu::int8_t var = EtchTypeCode::BYTE;
       EXPECT_TRUE(var == dataIn->checkValue(_long));
-    } else if (array2[i] >= capu::NumericLimitMin<capu::int16_t > () && array2[i] <= capu::NumericLimitMax<capu::int16_t > ()) {
+    } else if (array2[i] >= capu::NumericLimits::Min<capu::int16_t > () && array2[i] <= capu::NumericLimits::Max<capu::int16_t > ()) {
       capu::int8_t var = EtchTypeCode::SHORT;
       EXPECT_TRUE(var == dataIn->checkValue(_long));
-    } else if (array2[i] >= capu::NumericLimitMin<capu::int32_t > () && array2[i] <= capu::NumericLimitMax<capu::int32_t > ()) {
+    } else if (array2[i] >= capu::NumericLimits::Min<capu::int32_t > () && array2[i] <= capu::NumericLimits::Max<capu::int32_t > ()) {
       capu::int8_t var = EtchTypeCode::INT;
       EXPECT_TRUE(var == dataIn->checkValue(_long));
     } else {

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchComboValidatorTest.cpp Mon Mar 25 09:43:41 2013
@@ -52,30 +52,30 @@ TEST_F(EtchComboValidatorTest, createTes
 TEST_F(EtchComboValidatorTest, validateTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int32_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = NULL;
   capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
   //
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   //create combo validator
@@ -159,26 +159,26 @@ TEST_F(EtchComboValidatorTest, elementVa
   capu::SmartPointer<EtchObject> str = NULL;
   capu::SmartPointer<EtchObject> str2 = new EtchString("hello");
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int32_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
   //INT TEST
   EXPECT_FALSE(element_validator->validate(longInteger5));

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchDefaultValueFactoryTest.cpp Mon Mar 25 09:43:41 2013
@@ -232,7 +232,7 @@ TEST_F(EtchDefaultValueFactoryTest, impo
   EtchString strRuntime = "_Etch_RuntimeException";
   test->getType(strRuntime, type);
   EtchStructValue *sv = new EtchStructValue(type, test);
-  sv->put(EtchDefaultValueFactory::_mf_msg(), new EtchString("Error Message"), &deserialized);
+  sv->put(EtchDefaultValueFactory::_mf_msg(), new EtchString("Error Message"));
 
   //construct the object
   test->importCustomValue(sv, deserialized);

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchStructValueTest.cpp Mon Mar 25 09:43:41 2013
@@ -284,7 +284,6 @@ TEST_F(EtchStructValueTest, putTest_FULL
   capu::SmartPointer<EtchObject> object = new EtchBool(true);
   capu::SmartPointer<EtchObject> object2 = new EtchBool(false);
   capu::SmartPointer<EtchObject> object3 = NULL;
-  capu::SmartPointer<EtchObject> object4 = NULL;
   capu::SmartPointer<EtchObject> object5 = new EtchInt32(32);
 
   //check the empty struct value
@@ -299,7 +298,7 @@ TEST_F(EtchStructValueTest, putTest_FULL
   EXPECT_TRUE(sv->put(field3, object5) == ETCH_ENOT_EXIST);
   EXPECT_TRUE(sv->count() == 2);
   //add a null element and expect a remove operation
-  EXPECT_TRUE(sv->put(field1, object3, &object4) == ETCH_OK);
+  EXPECT_TRUE(sv->put(field1, object3) == ETCH_OK);
   EXPECT_TRUE(sv->count() == 1);
 
   delete sv;
@@ -334,7 +333,6 @@ TEST_F(EtchStructValueTest, putTest_MISS
   capu::SmartPointer<EtchObject> object = new EtchBool(true);
   capu::SmartPointer<EtchObject> object2 = new EtchBool(false);
   capu::SmartPointer<EtchObject> object3 = NULL;
-  capu::SmartPointer<EtchObject> object4 = NULL;
   capu::SmartPointer<EtchObject> object5 = new EtchInt32(32);
 
   //check the empty struct value
@@ -349,7 +347,7 @@ TEST_F(EtchStructValueTest, putTest_MISS
   EXPECT_TRUE(sv->put(field3, object5) == ETCH_OK);
   EXPECT_TRUE(sv->count() == 3);
   //add a null element and expect a remove operation
-  EXPECT_TRUE(sv->put(field1, object3, &object4) == ETCH_OK);
+  EXPECT_TRUE(sv->put(field1, object3) == ETCH_OK);
   EXPECT_TRUE(sv->count() == 2);
 
   delete sv;
@@ -384,7 +382,6 @@ TEST_F(EtchStructValueTest, putTest_NONE
   capu::SmartPointer<EtchObject> object = new EtchBool(true);
   capu::SmartPointer<EtchObject> object2 = new EtchBool(false);
   capu::SmartPointer<EtchObject> object3 = NULL;
-  capu::SmartPointer<EtchObject> object4 = NULL;
   capu::SmartPointer<EtchObject> object5 = new EtchInt32(32);
 
   //check the empty struct value
@@ -399,7 +396,7 @@ TEST_F(EtchStructValueTest, putTest_NONE
   EXPECT_TRUE(sv->put(field3, object5) == ETCH_OK);
   EXPECT_TRUE(sv->count() == 3);
   //add a null element and expect a remove operation
-  EXPECT_TRUE(sv->put(field1, object3, &object4) == ETCH_OK);
+  EXPECT_TRUE(sv->put(field1, object3) == ETCH_OK);
   EXPECT_TRUE(sv->count() == 2);
 
   delete sv;
@@ -436,7 +433,7 @@ TEST_F(EtchStructValueTest, getTest) {
 
   //add another element
   capu::SmartPointer<EtchObject> object2 = new EtchBool(false);
-  EXPECT_TRUE(sv->put(field1, object2, &object) == ETCH_OK);
+  EXPECT_TRUE(sv->put(field1, object2) == ETCH_OK);
   EXPECT_TRUE(sv->count() == 1);
 
   //get element

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorDoubleTest.cpp Mon Mar 25 09:43:41 2013
@@ -61,12 +61,12 @@ TEST_F(EtchValidatorDoubleTest, createTe
 TEST_F(EtchValidatorDoubleTest, validateTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> doubleTmp = new EtchDouble(capu::NumericLimitMax<capu::float_t>());
+  capu::SmartPointer<EtchObject> doubleTmp = new EtchDouble(capu::NumericLimits::Max<capu::float_t>());
   capu::SmartPointer<EtchObject> doubleTmp1 = new EtchDouble(0);
-  capu::SmartPointer<EtchObject> doubleTmp2 = new EtchDouble(capu::NumericLimitMin<capu::float_t>());
+  capu::SmartPointer<EtchObject> doubleTmp2 = new EtchDouble(capu::NumericLimits::Min<capu::float_t>());
   capu::SmartPointer<EtchObject> doubleTmp3 = new EtchDouble(897.12);
   //exceed limits of Float
-  capu::SmartPointer<EtchObject> doubleTmp4_true = new EtchDouble((capu::double_t)capu::NumericLimitMax<capu::float_t>() + (capu::double_t)2.12);
+  capu::SmartPointer<EtchObject> doubleTmp4_true = new EtchDouble((capu::double_t)capu::NumericLimits::Max<capu::float_t>() + (capu::double_t)2.12);
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
@@ -107,12 +107,12 @@ TEST_F(EtchValidatorDoubleTest, elementV
   capu::SmartPointer<EtchValidator> elementValidator;
   ptr->getElementValidator(elementValidator);
 
-  capu::SmartPointer<EtchObject> doubleTmp = new EtchDouble(capu::NumericLimitMax<capu::float_t>());
+  capu::SmartPointer<EtchObject> doubleTmp = new EtchDouble(capu::NumericLimits::Max<capu::float_t>());
   capu::SmartPointer<EtchObject> doubleTmp1 = new EtchDouble(0);
-  capu::SmartPointer<EtchObject> doubleTmp2 = new EtchDouble(capu::NumericLimitMin<capu::float_t>());
+  capu::SmartPointer<EtchObject> doubleTmp2 = new EtchDouble(capu::NumericLimits::Min<capu::float_t>());
   capu::SmartPointer<EtchObject> doubleTmp3 = new EtchDouble(897.12);
   //exceed limits of Float
-  capu::SmartPointer<EtchObject> doubleTmp4_true = new EtchDouble((capu::double_t)capu::NumericLimitMax<capu::float_t>() + (capu::double_t)2.12);
+  capu::SmartPointer<EtchObject> doubleTmp4_true = new EtchDouble((capu::double_t)capu::NumericLimits::Max<capu::float_t>() + (capu::double_t)2.12);
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorFloatTest.cpp Mon Mar 25 09:43:41 2013
@@ -62,9 +62,9 @@ TEST_F(EtchValidatorFloatTest, createTes
 TEST_F(EtchValidatorFloatTest, validateTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> floatTmp = new EtchFloat(capu::NumericLimitMin<capu::float_t>());
+  capu::SmartPointer<EtchObject> floatTmp = new EtchFloat(capu::NumericLimits::Min<capu::float_t>());
   capu::SmartPointer<EtchObject> floatTmp1 = new EtchFloat(0);
-  capu::SmartPointer<EtchObject> floatTmp2 = new EtchFloat(capu::NumericLimitMax<capu::float_t>());
+  capu::SmartPointer<EtchObject> floatTmp2 = new EtchFloat(capu::NumericLimits::Max<capu::float_t>());
   capu::SmartPointer<EtchObject> floatTmp3 = new EtchFloat(static_cast<capu::float_t>(897.12));
 
   //incompatible type
@@ -106,9 +106,9 @@ TEST_F(EtchValidatorFloatTest, elementVa
   capu::SmartPointer<EtchValidator> elementValidator;
   ptr->getElementValidator(elementValidator);
 
-  capu::SmartPointer<EtchObject> floatTmp = new EtchFloat(capu::NumericLimitMin<capu::float_t>());
+  capu::SmartPointer<EtchObject> floatTmp = new EtchFloat(capu::NumericLimits::Min<capu::float_t>());
   capu::SmartPointer<EtchObject> floatTmp1 = new EtchFloat(0);
-  capu::SmartPointer<EtchObject> floatTmp2 = new EtchFloat(capu::NumericLimitMax<capu::float_t>());
+  capu::SmartPointer<EtchObject> floatTmp2 = new EtchFloat(capu::NumericLimits::Max<capu::float_t>());
   capu::SmartPointer<EtchObject> floatTmp3 = new EtchFloat(static_cast<capu::float_t>(897.12));
 
   //incompatible type

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorIntTest.cpp Mon Mar 25 09:43:41 2013
@@ -59,29 +59,29 @@ TEST_F(EtchValidatorIntTest, createTest)
 TEST_F(EtchValidatorIntTest, validateTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int32_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   capu::SmartPointer<EtchValidator> ptr = NULL;
@@ -137,29 +137,29 @@ TEST_F(EtchValidatorIntTest, elementVali
   capu::SmartPointer<EtchValidator> elementValidator;
   ptr->getElementValidator(elementValidator);
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int32_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   EXPECT_FALSE(elementValidator->validate(str));

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorLongTest.cpp Mon Mar 25 09:43:41 2013
@@ -61,29 +61,29 @@ TEST_F(EtchValidatorLongTest, createTest
 TEST_F(EtchValidatorLongTest, validateTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int32_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
   capu::SmartPointer<EtchValidator> ptr = NULL;
   EXPECT_TRUE(EtchValidatorLong::Get(mRuntime, 0, ptr) == ETCH_OK);
@@ -135,29 +135,29 @@ TEST_F(EtchValidatorLongTest, elementVal
   capu::SmartPointer<EtchValidator> elementValidator;
   ptr->getElementValidator(elementValidator);
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int32_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int32_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int32_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int32_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   EXPECT_FALSE(elementValidator->validate(str));

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorObjectTest.cpp Mon Mar 25 09:43:41 2013
@@ -74,32 +74,32 @@ TEST_F(EtchValidatorObjectTest, validate
 TEST_F(EtchValidatorObjectTest, validateValueTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
   capu::SmartPointer<EtchObject> result = NULL;
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int16_t > ());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t > ());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > () + 2);
+  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t > () + 2);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int16_t > ());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int16_t > ());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t > () + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int16_t > () + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t > ());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t > ());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t > ());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t > ());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t > ());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t > ());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   capu::SmartPointer<EtchValidator> ptr = NULL;
@@ -133,32 +133,32 @@ TEST_F(EtchValidatorObjectTest, elementV
   ptr->getElementValidator(elementValidator);
 
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int16_t > ());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t > ());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t > () + 2);
+  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t > () + 2);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int16_t > ());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int16_t > ());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t > () + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int16_t > () + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t > ());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t > ());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t > ());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t > ());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t > ());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t > ());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t > ());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   EXPECT_TRUE(elementValidator->validate(str));

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorShortTest.cpp Mon Mar 25 09:43:41 2013
@@ -58,32 +58,32 @@ TEST_F(EtchValidatorShortTest, createTes
 TEST_F(EtchValidatorShortTest, validateTest) {
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>() + 2);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int16_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
   capu::SmartPointer<EtchValidator> ptr = NULL;
   EXPECT_TRUE(EtchValidatorShort::Get(mRuntime, 0, ptr) == ETCH_OK);
@@ -136,32 +136,32 @@ TEST_F(EtchValidatorShortTest, elementVa
   capu::SmartPointer<EtchValidator> elementValidator;
   ptr->getElementValidator(elementValidator);
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>() + 2);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int16_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   EXPECT_FALSE(elementValidator->validate(str));

Modified: etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/serialization/EtchValidatorStructValueTest.cpp Mon Mar 25 09:43:41 2013
@@ -132,31 +132,31 @@ TEST_F(EtchValidatorStructValueTest, ele
   val->getElementValidator(elementValidator);
 
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>() + 2);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int16_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
   //incompatible type
   capu::SmartPointer<EtchObject> str2 = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
   capu::SmartPointer<EtchObject> structValueval = new EtchStructValue(type, fac);
 
@@ -196,32 +196,32 @@ TEST_F(EtchValidatorStructValueTest, val
 
   capu::SmartPointer<EtchObject> byte = NULL;
 
-  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer = new EtchInt32(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer2 = new EtchInt32(0);
-  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> integer3 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> integer4 = new EtchInt32(897);
 
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimitMax<capu::int16_t>() + 2);
+  capu::SmartPointer<EtchObject> integer5 = new EtchInt32(capu::NumericLimits::Max<capu::int16_t>() + 2);
 
-  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger = new EtchLong(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger2 = new EtchLong(0);
-  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> longInteger3 = new EtchLong(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> longInteger4 = new EtchLong(897);
   //exceed limits of integer
-  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimitMax<capu::int16_t>() + (capu::int64_t)2);
+  capu::SmartPointer<EtchObject> longInteger5 = new EtchLong((capu::int64_t)capu::NumericLimits::Max<capu::int16_t>() + (capu::int64_t)2);
 
-  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimitMin<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger = new EtchShort(capu::NumericLimits::Min<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger2 = new EtchShort(0);
-  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimitMax<capu::int16_t>());
+  capu::SmartPointer<EtchObject> shortInteger3 = new EtchShort(capu::NumericLimits::Max<capu::int16_t>());
   capu::SmartPointer<EtchObject> shortInteger4 = new EtchShort();
 
   //incompatible type
   capu::SmartPointer<EtchObject> str2 = new EtchString();
 
-  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimitMax<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte1 = new EtchByte(capu::NumericLimits::Max<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte2 = new EtchByte(0);
-  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimitMin<capu::int8_t>());
+  capu::SmartPointer<EtchObject> byte3 = new EtchByte(capu::NumericLimits::Min<capu::int8_t>());
   capu::SmartPointer<EtchObject> byte4 = new EtchByte(32);
 
   EtchStructValue * value = new EtchStructValue(type, fac);

Modified: etch/trunk/binding-cpp/runtime/src/test/support/EtchMonitorTest.cpp
URL: http://svn.apache.org/viewvc/etch/trunk/binding-cpp/runtime/src/test/support/EtchMonitorTest.cpp?rev=1460566&r1=1460565&r2=1460566&view=diff
==============================================================================
--- etch/trunk/binding-cpp/runtime/src/test/support/EtchMonitorTest.cpp (original)
+++ etch/trunk/binding-cpp/runtime/src/test/support/EtchMonitorTest.cpp Mon Mar 25 09:43:41 2013
@@ -70,9 +70,9 @@ TEST(EtchMonitorTest, waitUntilEqTest) {
 
 namespace {
 
-class R1 : public capu::Runnable {
+class Runnable1 : public capu::Runnable {
 public:
-  R1(EtchMonitor *monitor) {
+  Runnable1(EtchMonitor *monitor) {
     mMonitor = monitor;
   }
 
@@ -103,9 +103,9 @@ TEST(EtchMonitorTest, waitUntilNotEqTest
 
   // blocking test
   m->set(tmp2, current);
-  R1* r1 = new R1(m);
-  capu::Thread* t1 = new capu::Thread(r1);
-  t1->start();
+  Runnable1* r1 = new Runnable1(m);
+  capu::Thread* t1 = new capu::Thread();
+  t1->start(*r1);
   EXPECT_EQ(ETCH_OK, m->waitUntilNotEq(tmp2, current));
   t1->join();
   delete r1;
@@ -134,9 +134,9 @@ TEST(EtchMonitorTest, waitUntilEqAndSetT
   m->set(tmp2, current);
   // blocking test
   m->set(tmp2, current);
-  R1* r1 = new R1(m);
-  capu::Thread* t1 = new capu::Thread(r1);
-  t1->start();
+  Runnable1* r1 = new Runnable1(m);
+  capu::Thread* t1 = new capu::Thread();
+  t1->start(*r1);
   EXPECT_EQ(ETCH_OK, m->waitUntilEqAndSet(tmp1, tmp2, current));
   t1->join();
   delete r1;
@@ -164,9 +164,9 @@ TEST(EtchMonitorTest, waitUntilNotEqAndS
   m->set(tmp2, current);
   // blocking test
   m->set(tmp2, current);
-  R1* r1 = new R1(m);
-  capu::Thread* t1 = new capu::Thread(r1);
-  t1->start();
+  Runnable1* r1 = new Runnable1(m);
+  capu::Thread* t1 = new capu::Thread();
+  t1->start(*r1);
   EXPECT_EQ(ETCH_OK, m->waitUntilNotEqAndSet(tmp2, tmp1, current));
   t1->join();
   delete r1;



Mime
View raw message