Author: tabish
Date: Mon Jun 2 12:57:46 2008
New Revision: 662539
URL: http://svn.apache.org/viewvc?rev=662539&view=rev
Log:
Cleanup code for up-coming 2.2 release, fixing warnings etc on windows.
Modified:
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/FloatArrayBufferTest.h
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/IntArrayBufferTest.h
Modified:
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/FloatArrayBufferTest.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/FloatArrayBufferTest.h?rev=662539&r1=662538&r2=662539&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/FloatArrayBufferTest.h
(original)
+++
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/FloatArrayBufferTest.h
Mon Jun 2 12:57:46 2008
@@ -154,7 +154,7 @@
float value = startValue;
for( std::size_t i = 0; i < length; i++ ) {
CPPUNIT_ASSERT( buf->get( startIndex + i ) == value );
- value = value + 1.0;
+ value = value + 1.0f;
}
}
Modified:
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/IntArrayBufferTest.h
URL:
http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/IntArrayBufferTest.h?rev=662539&r1=662538&r2=662539&view=diff
==============================================================================
---
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/IntArrayBufferTest.h
(original)
+++
activemq/activemq-cpp/trunk/src/test/decaf/internal/nio/IntArrayBufferTest.h
Mon Jun 2 12:57:46 2008
@@ -113,7 +113,7 @@
void loadTestData2( int* array, std::size_t offset, std::size_t length
) {
for( std::size_t i = 0; i < length; i++ ) {
- array[offset + i] = (int)length - i;
+ array[offset + i] = (int)(length - i);
}
}
@@ -127,7 +127,7 @@
void loadTestData2( decaf::nio::IntBuffer* buf ) {
buf->clear();
for( std::size_t i = 0; i < buf->capacity(); i++ ) {
- buf->put(i, (int) buf->capacity() - i);
+ buf->put(i, (int)( buf->capacity() - i) );
}
}