activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r925692 [14/14] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/commands/ main/activemq/io/ main/activemq/wireformat/openwire/ main/activemq/wireformat/openwire/marshal/ main/decaf/internal/io/ main/decaf/internal/ni...
Date Sat, 20 Mar 2010 21:57:24 GMT
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp Sat
Mar 20 21:57:20 2010
@@ -31,7 +31,7 @@ namespace {
     class MyInputStream : public InputStream{
     private:
         std::string data;
-        std::size_t pos;
+        int pos;
         bool throwOnRead;
         bool closed;
 
@@ -57,21 +57,21 @@ namespace {
             return this->closed;
         }
 
-        virtual std::size_t available() const throw (IOException){
+        virtual int available() const throw (IOException){
             if( isClosed() ) {
                 throw IOException(
                     __FILE__, __LINE__,
                     "MyInputStream::read - Stream already closed." );
             }
-            std::size_t len = data.length();
+            int len = (int)data.length();
             return len - pos;
         }
 
         virtual void close() throw(IOException){
             this->closed = true;
         }
-        virtual std::size_t skip( std::size_t num ) throw ( io::IOException, lang::exceptions::UnsupportedOperationException
) {
-            return ( pos += std::min( num, available() ) );
+        virtual long long skip( long long num ) throw ( io::IOException, lang::exceptions::UnsupportedOperationException
) {
+            return ( pos += std::min( num, (long long)available() ) );
         }
 
     protected:
@@ -83,20 +83,20 @@ namespace {
                     "MyInputStream::read - Throw on Read on." );
             }
 
-            if( pos >= data.length() ){
+            if( pos >= (int)data.length() ){
                 return -1;
             }
 
             return data.c_str()[pos++];
         }
 
-        virtual int doReadArrayBounded( unsigned char* buffer, std::size_t size,
-                                        std::size_t offset, std::size_t length )
+        virtual int doReadArrayBounded( unsigned char* buffer, int size,
+                                        int offset, int length )
             throw ( decaf::io::IOException,
                     decaf::lang::exceptions::IndexOutOfBoundsException,
                     decaf::lang::exceptions::NullPointerException ) {
 
-            std::size_t numToRead = std::min( length, available() );
+            int numToRead = std::min( length, available() );
 
             if( buffer == NULL ) {
                 throw NullPointerException( __FILE__, __LINE__, "Buffer was Null." );
@@ -119,7 +119,7 @@ namespace {
             }
 
             const char* str = data.c_str();
-            for( std::size_t ix=0; ix<numToRead; ++ix ){
+            for( int ix=0; ix<numToRead; ++ix ){
                 buffer[ix+offset] = str[pos+ix];
             }
 
@@ -140,7 +140,7 @@ void FilterInputStreamTest::testAvailabl
     FilterInputStream is( &myStream );
 
     CPPUNIT_ASSERT_MESSAGE( "Returned incorrect number of available bytes",
-                            is.available() == testStr.length() );
+                            is.available() == (int)testStr.length() );
 }
 
 ////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterOutputStreamTest.cpp
Sat Mar 20 21:57:20 2010
@@ -80,7 +80,7 @@ void FilterOutputStreamTest::testWrite1(
         ByteArrayInputStream bais( baos.toByteArray(), baos.size() );
         os.flush();
         CPPUNIT_ASSERT_MESSAGE( "Bytes not written after flush",
-                                bais.available() == testString.length() );
+                                bais.available() == (int)testString.length() );
         unsigned char* wbytes = new unsigned char[ testString.length() ];
         bais.read( wbytes, testString.length(), 0, testString.length() );
         CPPUNIT_ASSERT_MESSAGE("Incorrect bytes written",

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/PushbackInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/PushbackInputStreamTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/PushbackInputStreamTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/PushbackInputStreamTest.cpp
Sat Mar 20 21:57:20 2010
@@ -90,7 +90,7 @@ void PushbackInputStreamTest::testMark()
 
     std::vector<unsigned char> temp( 1 );
     ByteArrayInputStream bais( temp );
-    PushbackInputStream pb( &bais, (std::size_t)2 );
+    PushbackInputStream pb( &bais, 2 );
 
     pb.mark( Integer::MAX_VALUE );
     pb.mark( 0 );
@@ -126,7 +126,7 @@ void PushbackInputStreamTest::testConstr
 
     std::vector<unsigned char> temp( testString.begin(), testString.end() );
     ByteArrayInputStream bais( temp );
-    PushbackInputStream pb( &bais, (std::size_t)5 );
+    PushbackInputStream pb( &bais, 5 );
 
     unsigned char un[] = { 'h', 'e', 'l', 'l', 'o', 's' };
 
@@ -139,7 +139,7 @@ void PushbackInputStreamTest::testConstr
 ////////////////////////////////////////////////////////////////////////////////
 void PushbackInputStreamTest::testConstructor3() {
 
-    PushbackInputStream pb( NULL, (std::size_t)1 );
+    PushbackInputStream pb( NULL, 1 );
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "Should Throw an IOException",
         pb.read(),
@@ -154,7 +154,7 @@ void PushbackInputStreamTest::testAvaila
         PushbackInputStream pb( &bais );
 
         CPPUNIT_ASSERT_EQUAL_MESSAGE( "Should have been testString.length available.",
-                                      testString.length(), pb.available() );
+                                      (int)testString.length(), pb.available() );
     } catch( IOException& e ) {
         CPPUNIT_FAIL( std::string() + "Exception during available test: " + e.getMessage()
);
     }
@@ -206,7 +206,7 @@ void PushbackInputStreamTest::testSkip()
 
     std::vector<unsigned char> temp( testString.begin(), testString.end() );
     ByteArrayInputStream bais( temp );
-    PushbackInputStream pb( &bais, (std::size_t) 65535 );
+    PushbackInputStream pb( &bais, 65535 );
 
     unsigned char buf[50];
     pb.skip( 50 );
@@ -228,7 +228,7 @@ void PushbackInputStreamTest::testUnread
 
         std::vector<unsigned char> temp( testString.begin(), testString.end() );
         ByteArrayInputStream bais( temp );
-        PushbackInputStream pb( &bais, (std::size_t) 65535 );
+        PushbackInputStream pb( &bais, 65535 );
 
         unsigned char buf[100];
         pb.read(buf, 100, 0, 100 );
@@ -248,7 +248,7 @@ void PushbackInputStreamTest::testUnread
 
     std::vector<unsigned char> temp( testString.begin(), testString.end() );
     ByteArrayInputStream bais( temp );
-    PushbackInputStream pb( &bais, (std::size_t) 65535 );
+    PushbackInputStream pb( &bais, 65535 );
 
     unsigned char buf[100];
     pb.read( buf, 100, 0, 100 );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/ReaderTest.cpp Sat Mar 20 21:57:20
2010
@@ -38,8 +38,8 @@ namespace {
 
         std::vector<char> contents;
 
-        std::size_t current_offset;
-        std::size_t length;
+        int current_offset;
+        int length;
 
     public:
 
@@ -60,8 +60,8 @@ namespace {
 
     protected:
 
-        virtual int doReadArrayBounded( char* buffer, std::size_t size,
-                                        std::size_t offset, std::size_t length )
+        virtual int doReadArrayBounded( char* buffer, int size,
+                                        int offset, int length )
             throw( decaf::io::IOException,
                    decaf::lang::exceptions::NullPointerException,
                    decaf::lang::exceptions::IndexOutOfBoundsException ) {
@@ -74,7 +74,7 @@ namespace {
             }
 
             length = Math::min( (long long)length, (long long)( this->length - current_offset
) );
-            for( std::size_t i = 0; i < length; i++ ) {
+            for( int i = 0; i < length; i++ ) {
                 buffer[offset + i] = contents[current_offset + i];
             }
 
@@ -184,7 +184,7 @@ void ReaderTest::testRead() {
     MockReader mockReader(srcBuffer);
 
     // normal read
-    for( std::size_t ix = 0; ix < srcBuffer.size(); ++ix ) {
+    for( int ix = 0; ix < (int)srcBuffer.size(); ++ix ) {
 
         char c = srcBuffer[ix];
         CPPUNIT_ASSERT_EQUAL_MESSAGE(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/WriterTest.cpp Sat Mar 20 21:57:20
2010
@@ -34,12 +34,12 @@ namespace {
     private:
 
         char* contents;
-        std::size_t length;
-        std::size_t offset;
+        int length;
+        int offset;
 
     public:
 
-        MockWriter( std::size_t capacity ) {
+        MockWriter( int capacity ) {
             contents = new char[capacity];
             length = capacity;
             offset = 0;
@@ -59,7 +59,7 @@ namespace {
         }
 
         virtual void doWriteArrayBounded(
-            const char* buffer, std::size_t size, std::size_t offset, std::size_t length
)
+            const char* buffer, int size, int offset, int length )
                 throw( decaf::io::IOException,
                        decaf::lang::exceptions::NullPointerException,
                        decaf::lang::exceptions::IndexOutOfBoundsException ) {
@@ -73,7 +73,7 @@ namespace {
                     __FILE__, __LINE__, "offset + length must be less than size." );
             }
 
-            for( std::size_t i = 0; i < length; i++ ) {
+            for( int i = 0; i < length; i++ ) {
                 contents[this->offset + i] = buffer[offset + i];
             }
 
@@ -85,7 +85,7 @@ namespace {
 
             std::vector<char> result( offset );
 
-            for( std::size_t i = 0; i < offset; i++ ) {
+            for( int i = 0; i < offset; i++ ) {
                 result[i] = contents[i];
             }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.cpp Sat Mar 20
21:57:20 2010
@@ -23,6 +23,9 @@ using namespace decaf::lang;
 using namespace decaf::lang::exceptions;
 
 ////////////////////////////////////////////////////////////////////////////////
+const int BufferTest::DEFAULT_BUFFER_SIZE = 512;
+
+////////////////////////////////////////////////////////////////////////////////
 void BufferTest::test() {
 
     // Check that we have setup the array and our initial assumptions on state
@@ -61,7 +64,7 @@ void BufferTest::testClear() {
 ////////////////////////////////////////////////////////////////////////////////
 void BufferTest::testFlip() {
 
-    std::size_t oldPosition = buffer->position();
+    int oldPosition = buffer->position();
 
     Buffer& ret = buffer->flip();
     CPPUNIT_ASSERT( &ret == buffer );
@@ -99,7 +102,7 @@ void BufferTest::testLimit() {
 ////////////////////////////////////////////////////////////////////////////////
 void BufferTest::testLimitInt() {
 
-    std::size_t oldPosition = buffer->position();
+    int oldPosition = buffer->position();
     Buffer& ret = buffer->limit(buffer->limit());
     CPPUNIT_ASSERT( &ret == buffer );
 
@@ -133,7 +136,7 @@ void BufferTest::testLimitInt() {
 ////////////////////////////////////////////////////////////////////////////////
 void BufferTest::testMark() {
 
-    std::size_t oldPosition = buffer->position();
+    int oldPosition = buffer->position();
     Buffer& ret = buffer->mark();
     CPPUNIT_ASSERT( &ret == buffer );
 
@@ -159,7 +162,7 @@ void BufferTest::testPosition() {
 ////////////////////////////////////////////////////////////////////////////////
 void BufferTest::testPositionInt() {
 
-    std::size_t oldPosition = buffer->position();
+    int oldPosition = buffer->position();
 
     CPPUNIT_ASSERT_THROW_MESSAGE(
         "Should throw IllegalArgumentException",
@@ -202,7 +205,7 @@ void BufferTest::testRemaining() {
 ////////////////////////////////////////////////////////////////////////////////
 void BufferTest::testReset() {
 
-    std::size_t oldPosition = buffer->position();
+    int oldPosition = buffer->position();
 
     buffer->mark();
     buffer->position(buffer->limit());

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.h?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/nio/BufferTest.h Sat Mar 20 21:57:20
2010
@@ -49,12 +49,12 @@ namespace nio{
 
         Buffer* buffer;
 
-        static const std::size_t DEFAULT_BUFFER_SIZE = 512;
+        static const int DEFAULT_BUFFER_SIZE;
 
         class MyBuffer : public Buffer {
         public:
 
-            MyBuffer( std::size_t capacity ) : Buffer( capacity ) {
+            MyBuffer( int capacity ) : Buffer( capacity ) {
             }
 
             virtual ~MyBuffer() {}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/CheckedInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/CheckedInputStreamTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/CheckedInputStreamTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/CheckedInputStreamTest.cpp
Sat Mar 20 21:57:20 2010
@@ -110,7 +110,7 @@ void CheckedInputStreamTest::testSkip() 
     Adler32 adler;
     CheckedInputStream checkIn( &bais, &adler );
 
-    std::size_t skipValue = 5;
+    long long skipValue = 5;
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "the value returned by skip(n) is not the same as its parameter",
                                   skipValue, checkIn.skip( skipValue ) );
     checkIn.skip( skipValue );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/DeflaterOutputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/DeflaterOutputStreamTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/DeflaterOutputStreamTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/DeflaterOutputStreamTest.cpp
Sat Mar 20 21:57:20 2010
@@ -62,7 +62,7 @@ namespace{
             this->deflateFlag = false;
         }
 
-        MyDeflaterOutputStream( OutputStream* out, Deflater* defl, std::size_t size ) :
+        MyDeflaterOutputStream( OutputStream* out, Deflater* defl, int size ) :
             DeflaterOutputStream( out, defl, size ) {
 
             this->deflateFlag = false;
@@ -167,8 +167,8 @@ void DeflaterOutputStreamTest::testConst
 ////////////////////////////////////////////////////////////////////////////////
 void DeflaterOutputStreamTest::testConstructorOutputStreamDeflaterI() {
 
-    std::size_t buf = 5;
-    std::size_t zeroBuf = 0;
+    int buf = 5;
+    int zeroBuf = 0;
 
     unsigned char byteArray[] = { 1, 3, 4, 7, 8, 3, 6 };
     ByteArrayOutputStream baos;

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterInputStreamTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterInputStreamTest.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterInputStreamTest.cpp
Sat Mar 20 21:57:20 2010
@@ -94,7 +94,7 @@ namespace {
         MyInflaterInputStream( InputStream* in, Inflater* infl ) : InflaterInputStream( in,
infl ) {
         }
 
-        MyInflaterInputStream( InputStream* in, Inflater* infl, std::size_t size )
+        MyInflaterInputStream( InputStream* in, Inflater* infl, int size )
             : InflaterInputStream( in, infl, size ) {
         }
 
@@ -155,7 +155,7 @@ void InflaterInputStreamTest::testConstr
 
     ByteArrayInputStream bais( deflatedData );
     Inflater inflate;
-    InflaterInputStream inflatIP( &bais, &inflate, (std::size_t)1 );
+    InflaterInputStream inflatIP( &bais, &inflate, 1 );
 
     int i = 0;
     while( ( result = inflatIP.read() ) != -1 ) {
@@ -193,7 +193,7 @@ void InflaterInputStreamTest::testRead()
     int result = 0;
     ByteArrayInputStream bais( deflatedData );
     Inflater inflate;
-    InflaterInputStream inflatIP( &bais, &inflate, (std::size_t)1 );
+    InflaterInputStream inflatIP( &bais, &inflate, 1 );
 
     int i = 0;
     while( ( result = inflatIP.read() ) != -1 ) {
@@ -266,7 +266,7 @@ void InflaterInputStreamTest::testReadBI
 
     ByteArrayOutputStream baos;
     DeflaterOutputStream dos( &baos );
-    dos.write( test, (std::size_t)507 );
+    dos.write( test, 507 );
     dos.close();
 
     ByteArrayInputStream bais( baos.toByteArrayRef() );
@@ -344,7 +344,7 @@ void InflaterInputStreamTest::testSkip()
 
     // Test for skipping more bytes than available in the stream
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "Incorrect Number Of Bytes Skipped.",
-                                  testString.length() - 6, iis.skip( testString.length()
) );
+                                  (long long)testString.length() - 6, iis.skip( testString.length()
) );
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "Incorrect Byte Returned.", -1, iis.read() );
     iis.close();
 }
@@ -358,9 +358,9 @@ void InflaterInputStreamTest::testSkip2(
     ByteArrayInputStream bais1( this->deflatedData );
     InflaterInputStream iis1( &bais1 );
 
-    std::size_t skip = iis1.skip( Integer::MAX_VALUE );
+    long long skip = iis1.skip( Integer::MAX_VALUE );
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "method skip() returned wrong number of bytes skipped",
-                                  testString.size(), skip );
+                                  (long long)testString.size(), skip );
 
     // test for skipping of 2 bytes
     ByteArrayInputStream bais2( this->deflatedData );
@@ -368,7 +368,7 @@ void InflaterInputStreamTest::testSkip2(
 
     skip = iis2.skip( 2 );
     CPPUNIT_ASSERT_EQUAL_MESSAGE( "the number of bytes returned by skip did not correspond
with its input parameters",
-                                  (std::size_t)2, skip );
+                                  2LL, skip );
     int i = 0;
     int result = 0;
     while( ( result = iis2.read() ) != -1 ) {
@@ -378,7 +378,7 @@ void InflaterInputStreamTest::testSkip2(
 
     iis2.close();
 
-    for( std::size_t j = 2; j < testString.length(); j++ ) {
+    for( int j = 2; j < (int)testString.length(); j++ ) {
         CPPUNIT_ASSERT_MESSAGE( "original compressed data did not equal decompressed data",
                                 buffer[j - 2] == testString.at( j ) );
     }

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterTest.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/util/zip/InflaterTest.cpp Sat
Mar 20 21:57:20 2010
@@ -619,8 +619,8 @@ void InflaterTest::testSetInputBIII() {
 
     static const std::size_t SIZE = 12;
     unsigned char byteArray[] = { 2, 3, 4, 't', 'y', 'u', 'e', 'w', 7, 6, 5, 9 };
-    std::size_t offSet = 6;
-    std::size_t length = 6;
+    int offSet = 6;
+    int length = 6;
 
     Inflater inflate;
     inflate.setInput( byteArray, SIZE, offSet, length );
@@ -657,8 +657,8 @@ void InflaterTest::testGetBytesRead() {
     def.finish();
     def.deflate( output );
     inf.setInput( output );
-    std::size_t compressedDataLength = inf.inflate( input );
-    CPPUNIT_ASSERT_EQUAL( compressedDataLength, (std::size_t)inf.getBytesWritten() );
+    int compressedDataLength = inf.inflate( input );
+    CPPUNIT_ASSERT_EQUAL( (long long)compressedDataLength, inf.getBytesWritten() );
     CPPUNIT_ASSERT_EQUAL( 16LL, inf.getBytesRead() );
 }
 
@@ -680,9 +680,9 @@ void InflaterTest::testGetBytesWritten()
     def.finish();
     def.deflate( output );
     inf.setInput( output );
-    std::size_t compressedDataLength = inf.inflate( input );
+    int compressedDataLength = inf.inflate( input );
     CPPUNIT_ASSERT_EQUAL( 16LL, inf.getBytesRead() );
-    CPPUNIT_ASSERT_EQUAL( compressedDataLength, (std::size_t)inf.getBytesWritten() );
+    CPPUNIT_ASSERT_EQUAL( compressedDataLength, (int)inf.getBytesWritten() );
     CPPUNIT_ASSERT_EQUAL( 14LL, inf.getBytesWritten() );
 }
 
@@ -691,7 +691,7 @@ void InflaterTest::testInflate() {
 
     Inflater inf;
     std::vector<unsigned char> empty(0);
-    std::size_t res = inf.inflate( empty );
+    int res = inf.inflate( empty );
 
     CPPUNIT_ASSERT_EQUAL( 0, (int)res );
 
@@ -733,7 +733,7 @@ void InflaterTest::testInflate() {
 ////////////////////////////////////////////////////////////////////////////////
 void InflaterTest::testSetDictionaryB() {
 
-    std::size_t i = 0;
+    int i = 0;
     std::string inputString = "blah string contains blahblahblahblah and blah";
     std::vector<unsigned char> input( inputString.begin(), inputString.end() );
     std::string dictionary1String = "blah";
@@ -760,9 +760,9 @@ void InflaterTest::testSetDictionaryB() 
     defDict1.finish();
     defDict2.finish();
 
-    std::size_t dataLenNo = defDictNo.deflate( outputNo );
-    std::size_t dataLen1 = defDict1.deflate( output1 );
-    std::size_t dataLen2 = defDict2.deflate( output2 );
+    int dataLenNo = defDictNo.deflate( outputNo );
+    int dataLen1 = defDict1.deflate( output1 );
+    int dataLen2 = defDict2.deflate( output2 );
 
     bool passNo1 = false;
     bool passNo2 = false;
@@ -796,7 +796,7 @@ void InflaterTest::testSetDictionaryB() 
     Inflater infl2;
 
     std::vector<unsigned char> result(100);
-    std::size_t decLen;
+    int decLen;
 
     inflNo.setInput( outputNo, 0, dataLenNo );
     decLen = inflNo.inflate( result );
@@ -852,7 +852,7 @@ void InflaterTest::testSetDictionaryB() 
 ////////////////////////////////////////////////////////////////////////////////
 void InflaterTest::testSetDictionaryBIII() {
 
-    std::size_t i = 0;
+    int i = 0;
     std::string inputString = "blah string contains blahblahblahblah and blah";
     std::vector<unsigned char> input( inputString.begin(), inputString.end() );
     std::string dictionary1String = "blah";
@@ -880,9 +880,9 @@ void InflaterTest::testSetDictionaryBIII
     defDict2.finish();
     defDict3.finish();
 
-    std::size_t dataLen1 = defDict1.deflate( output1 );
-    std::size_t dataLen2 = defDict2.deflate( output2 );
-    std::size_t dataLen3 = defDict3.deflate( output3 );
+    int dataLen1 = defDict1.deflate( output1 );
+    int dataLen2 = defDict2.deflate( output2 );
+    int dataLen3 = defDict3.deflate( output3 );
 
     bool pass12 = false;
     bool pass23 = false;
@@ -916,7 +916,7 @@ void InflaterTest::testSetDictionaryBIII
     Inflater infl3;
 
     std::vector<unsigned char> result(100);
-    std::size_t decLen;
+    int decLen;
 
     infl1.setInput( output1, 0, dataLen1 );
     decLen = infl1.inflate( result );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp?rev=925692&r1=925691&r2=925692&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp Sat Mar 20 21:57:20
2010
@@ -141,8 +141,6 @@ CPPUNIT_TEST_SUITE_REGISTRATION( decaf::
 #include <decaf/internal/util/TimerTaskHeapTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::TimerTaskHeapTest );
 
-#include <decaf/internal/nio/ByteArrayPerspectiveTest.h>
-CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayPerspectiveTest );
 #include <decaf/internal/nio/ByteArrayBufferTest.h>
 CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayBufferTest );
 #include <decaf/internal/nio/BufferFactoryTest.h>



Mime
View raw message