activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r476372 - in /incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq: connector/openwire/marshal/BaseDataStreamMarshaller.cpp util/Long.h
Date Fri, 17 Nov 2006 23:48:45 GMT
Author: tabish
Date: Fri Nov 17 15:48:44 2006
New Revision: 476372

URL: http://svn.apache.org/viewvc?view=rev&rev=476372
Log:
Updates for planned Openwire Support

Modified:
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
    incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Long.h

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp?view=diff&rev=476372&r1=476371&r2=476372
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/marshal/BaseDataStreamMarshaller.cpp
Fri Nov 17 15:48:44 2006
@@ -22,9 +22,12 @@
 #include <activemq/connector/openwire/commands/LocalTransactionId.h>
 #include <activemq/connector/openwire/commands/XATransactionId.h>
 #include <activemq/connector/openwire/utils/HexTable.h>
+#include <activemq/util/Long.h>
+#include <activemq/util/Integer.h>
 
 using namespace std;
 using namespace activemq;
+using namespace activemq::util;
 using namespace activemq::connector;
 using namespace activemq::connector::openwire;
 using namespace activemq::connector::openwire::marshal;
@@ -68,9 +71,9 @@
     }
     else if( xaTxnId != NULL )
     {
-//        return string("XID:") + Integer::toString( xaTxnId->getFormatId() ) + ":" +

-//               toHexFromBytes( xaTxnId->getGlobalTransactionId() ) + ":" + 
-//               toHexFromBytes( xaTxnId->getBranchQualifier() );        
+        return string("XID:") + Integer::toString( xaTxnId->getFormatId() ) + ":" + 
+               toHexFromBytes( xaTxnId->getGlobalTransactionId() ) + ":" + 
+               toHexFromBytes( xaTxnId->getBranchQualifier() );        
     }
 
     return "";

Modified: incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Long.h
URL: http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Long.h?view=diff&rev=476372&r1=476371&r2=476372
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Long.h (original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/util/Long.h Fri Nov
17 15:48:44 2006
@@ -35,8 +35,8 @@
          * @param String to parse
          * @return long value
          */
-        static long parseLong( const std::string& value ){
-            long ret = 0;
+        static long long parseLong( const std::string& value ){
+            long long ret = 0;
             std::istringstream istream(value);
             istream.clear();
             istream >> ret;
@@ -48,7 +48,7 @@
          * @param long to convert
          * @return string representation
          */
-        static std::string toString( long value ){
+        static std::string toString( long long value ){
             std::ostringstream ostream;
             ostream << value;
             return ostream.str();



Mime
View raw message