activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1516963 - in /activemq/activemq-cpp/trunk: activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdSourceGenerator.java activemq-cpp/src/main/activemq/commands/XATransactionId.cpp
Date Fri, 23 Aug 2013 18:16:53 GMT
Author: tabish
Date: Fri Aug 23 18:16:53 2013
New Revision: 1516963

URL: http://svn.apache.org/r1516963
Log:
fix some warnings on windows

Modified:
    activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdSourceGenerator.java
    activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdSourceGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdSourceGenerator.java?rev=1516963&r1=1516962&r2=1516963&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdSourceGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdSourceGenerator.java
Fri Aug 23 18:16:53 2013
@@ -136,7 +136,9 @@ public class XATransactionIdSourceGenera
         out.println("        return 0;");
         out.println("    }");
         out.println("");
-        out.println("    std::copy( this->branchQualifier.begin(), this->branchQualifier.end(),
buffer );");
+        out.println("    for (int i = 0; i < (int)this->branchQualifier.size(); ++i)
{");
+        out.println("        buffer[i] = this->branchQualifier.at(i);");
+        out.println("    }");
         out.println("");
         out.println("    return (int)this->branchQualifier.size();");
         out.println("}");
@@ -160,7 +162,9 @@ public class XATransactionIdSourceGenera
         out.println("        return 0;");
         out.println("    }");
         out.println("");
-        out.println("    std::copy( this->globalTransactionId.begin(), this->globalTransactionId.end(),
buffer );");
+        out.println("    for (int i = 0; i < (int)this->globalTransactionId.size();
++i) {");
+        out.println("        buffer[i] = this->globalTransactionId.at(i);");
+        out.println("    }");
         out.println("");
         out.println("    return (int)this->globalTransactionId.size();");
         out.println("}");

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp?rev=1516963&r1=1516962&r2=1516963&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/XATransactionId.cpp
Fri Aug 23 18:16:53 2013
@@ -351,7 +351,9 @@ int XATransactionId::getBranchQualifier(
         return 0;
     }
 
-    std::copy( this->branchQualifier.begin(), this->branchQualifier.end(), buffer );
+    for (int i = 0; i < (int)this->branchQualifier.size(); ++i) {
+        buffer[i] = this->branchQualifier.at(i);
+    }
 
     return (int)this->branchQualifier.size();
 }
@@ -375,7 +377,9 @@ int XATransactionId::getGlobalTransactio
         return 0;
     }
 
-    std::copy( this->globalTransactionId.begin(), this->globalTransactionId.end(),
buffer );
+    for (int i = 0; i < (int)this->globalTransactionId.size(); ++i) {
+        buffer[i] = this->globalTransactionId.at(i);
+    }
 
     return (int)this->globalTransactionId.size();
 }



Mime
View raw message