Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 12829 invoked from network); 29 Mar 2010 19:40:26 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 29 Mar 2010 19:40:26 -0000 Received: (qmail 15141 invoked by uid 500); 29 Mar 2010 19:40:26 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 15098 invoked by uid 500); 29 Mar 2010 19:40:26 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 15014 invoked by uid 99); 29 Mar 2010 19:40:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Mar 2010 19:40:26 +0000 X-ASF-Spam-Status: No, hits=-1170.8 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Mar 2010 19:40:18 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7634623889D7; Mon, 29 Mar 2010 19:39:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r928883 [2/7] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/commands/ main/activemq/wireformat/openwire/ main/activemq/wireformat/openwire/marshal/ main/decaf/io/ test-benchmarks/decaf/io/ test/activemq/transport/ ... Date: Mon, 29 Mar 2010 19:39:46 -0000 To: commits@activemq.apache.org From: tabish@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100329193957.7634623889D7@eris.apache.org> Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQStreamMessageMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -100,7 +100,8 @@ void ActiveMQStreamMessageMarshallerTest marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -158,7 +159,8 @@ void ActiveMQStreamMessageMarshallerTest marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempQueueMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ActiveMQTempQueueMarshallerTest::te marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ActiveMQTempQueueMarshallerTest::te marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTempTopicMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ActiveMQTempTopicMarshallerTest::te marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ActiveMQTempTopicMarshallerTest::te marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTextMessageMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -100,7 +100,8 @@ void ActiveMQTextMessageMarshallerTest:: marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -158,7 +159,8 @@ void ActiveMQTextMessageMarshallerTest:: marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ActiveMQTopicMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ActiveMQTopicMarshallerTest::testLo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ActiveMQTopicMarshallerTest::testTi marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void BrokerIdMarshallerTest::testLooseMa marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void BrokerIdMarshallerTest::testTightMa marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/BrokerInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void BrokerInfoMarshallerTest::testLoose marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void BrokerInfoMarshallerTest::testTight marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionControlMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConnectionControlMarshallerTest::te marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConnectionControlMarshallerTest::te marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionErrorMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConnectionErrorMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConnectionErrorMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConnectionIdMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConnectionIdMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConnectionInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConnectionInfoMarshallerTest::testL marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConnectionInfoMarshallerTest::testT marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerControlMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConsumerControlMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConsumerControlMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConsumerIdMarshallerTest::testLoose marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConsumerIdMarshallerTest::testTight marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ConsumerInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ConsumerInfoMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ConsumerInfoMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ControlCommandMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ControlCommandMarshallerTest::testL marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ControlCommandMarshallerTest::testT marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataArrayResponseMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void DataArrayResponseMarshallerTest::te marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void DataArrayResponseMarshallerTest::te marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataResponseMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataResponseMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataResponseMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DataResponseMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void DataResponseMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void DataResponseMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DestinationInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void DestinationInfoMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void DestinationInfoMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/DiscoveryEventMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void DiscoveryEventMarshallerTest::testL marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void DiscoveryEventMarshallerTest::testT marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ExceptionResponseMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ExceptionResponseMarshallerTest::te marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ExceptionResponseMarshallerTest::te marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/FlushCommandMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/FlushCommandMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/FlushCommandMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/FlushCommandMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void FlushCommandMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void FlushCommandMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/IntegerResponseMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void IntegerResponseMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void IntegerResponseMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalQueueAckMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void JournalQueueAckMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void JournalQueueAckMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTopicAckMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void JournalTopicAckMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void JournalTopicAckMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTraceMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTraceMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTraceMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTraceMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void JournalTraceMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void JournalTraceMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/JournalTransactionMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void JournalTransactionMarshallerTest::t marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void JournalTransactionMarshallerTest::t marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/KeepAliveInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void KeepAliveInfoMarshallerTest::testLo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void KeepAliveInfoMarshallerTest::testTi marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LastPartialCommandMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void LastPartialCommandMarshallerTest::t marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void LastPartialCommandMarshallerTest::t marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/LocalTransactionIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void LocalTransactionIdMarshallerTest::t marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void LocalTransactionIdMarshallerTest::t marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageAckMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageAckMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageAckMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageAckMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void MessageAckMarshallerTest::testLoose marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void MessageAckMarshallerTest::testTight marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void MessageDispatchMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void MessageDispatchMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageDispatchNotificationMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void MessageDispatchNotificationMarshall marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void MessageDispatchNotificationMarshall marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessageIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void MessageIdMarshallerTest::testLooseM marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void MessageIdMarshallerTest::testTightM marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessagePullMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessagePullMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessagePullMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/MessagePullMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void MessagePullMarshallerTest::testLoos marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void MessagePullMarshallerTest::testTigh marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/NetworkBridgeFilterMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void NetworkBridgeFilterMarshallerTest:: marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void NetworkBridgeFilterMarshallerTest:: marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/PartialCommandMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void PartialCommandMarshallerTest::testL marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void PartialCommandMarshallerTest::testT marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerAckMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ProducerAckMarshallerTest::testLoos marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ProducerAckMarshallerTest::testTigh marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ProducerIdMarshallerTest::testLoose marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ProducerIdMarshallerTest::testTight marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ProducerInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ProducerInfoMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ProducerInfoMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void RemoveInfoMarshallerTest::testLoose marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void RemoveInfoMarshallerTest::testTight marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/RemoveSubscriptionInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void RemoveSubscriptionInfoMarshallerTes marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void RemoveSubscriptionInfoMarshallerTes marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ReplayCommandMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ReplayCommandMarshallerTest::testLo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ReplayCommandMarshallerTest::testTi marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ResponseMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ResponseMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ResponseMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ResponseMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ResponseMarshallerTest::testLooseMa marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ResponseMarshallerTest::testTightMa marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionIdMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionIdMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionIdMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionIdMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void SessionIdMarshallerTest::testLooseM marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void SessionIdMarshallerTest::testTightM marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SessionInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void SessionInfoMarshallerTest::testLoos marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void SessionInfoMarshallerTest::testTigh marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/ShutdownInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void ShutdownInfoMarshallerTest::testLoo marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void ShutdownInfoMarshallerTest::testTig marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/SubscriptionInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void SubscriptionInfoMarshallerTest::tes marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void SubscriptionInfoMarshallerTest::tes marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/TransactionInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void TransactionInfoMarshallerTest::test marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void TransactionInfoMarshallerTest::test marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshallerTest.cpp URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshallerTest.cpp?rev=928883&r1=928882&r2=928883&view=diff ============================================================================== --- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshallerTest.cpp (original) +++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/wireformat/openwire/marshal/v1/WireFormatInfoMarshallerTest.cpp Mon Mar 29 19:39:39 2010 @@ -88,7 +88,8 @@ void WireFormatInfoMarshallerTest::testL marshaller.looseMarshal( &openWireFormat, &outCommand, &dataOut ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte(); CPPUNIT_ASSERT( dataType == outCommand.getDataStructureType() ); @@ -134,7 +135,8 @@ void WireFormatInfoMarshallerTest::testT marshaller.tightMarshal2( &openWireFormat, &outCommand, &dataOut, &bs ); // Now read it back in and make sure it's all right. - ByteArrayInputStream bais( baos.toByteArray(), (int)baos.size() ); + std::pair array = baos.toByteArray(); + ByteArrayInputStream bais( array.first, array.second, true ); DataInputStream dataIn( &bais ); unsigned char dataType = dataIn.readByte();