activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r926753 - in /activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands: CommandHeaderGenerator.java CommandSourceGenerator.java
Date Tue, 23 Mar 2010 19:48:05 GMT
Author: tabish
Date: Tue Mar 23 19:48:05 2010
New Revision: 926753

URL: http://svn.apache.org/viewvc?rev=926753&view=rev
Log:
Make hidden copy constructors and assignment operators privet to get around the need for an
impl when built as DLL.

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

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java?rev=926753&r1=926752&r2=926753&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java
Tue Mar 23 19:48:05 2010
@@ -64,10 +64,10 @@ public class CommandHeaderGenerator exte
         generateProperties( out );
 
         if( !isAssignable() ) {
-            out.println("    protected:");
+            out.println("    private:");
             out.println("");
             out.println("        "+getClassName()+"( const "+getClassName()+"& );");
-            out.println("        "+getClassName()+"& operator= ( const "+getClassName()+"&
) { return *this; };");
+            out.println("        "+getClassName()+"& operator= ( const "+getClassName()+"&
);");
             out.println("");
         }
 

Modified: activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java?rev=926753&r1=926752&r2=926753&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java
(original)
+++ activemq/activemq-cpp/trunk/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java
Tue Mar 23 19:48:05 2010
@@ -59,13 +59,15 @@ public class CommandSourceGenerator exte
         generateDefaultConstructorBody(out);
         out.println("}");
         out.println("");
-        out.println("////////////////////////////////////////////////////////////////////////////////");
-        out.println(""+getClassName()+"::"+getClassName()+"( const "+getClassName()+"&
other )");
-        out.println("    : " + generateInitializerList(getBaseClassName() + "()") + " {");
-        out.println("");
-        out.println("    this->copyDataStructure( &other );");
-        out.println("}");
-        out.println("");
+        if( isAssignable() ) {
+            out.println("////////////////////////////////////////////////////////////////////////////////");
+            out.println(""+getClassName()+"::"+getClassName()+"( const "+getClassName()+"&
other )");
+            out.println("    : " + generateInitializerList(getBaseClassName() + "()") + "
{");
+            out.println("");
+            out.println("    this->copyDataStructure( &other );");
+            out.println("}");
+            out.println("");
+        }
         generateAdditionalConstructors(out);
         out.println("////////////////////////////////////////////////////////////////////////////////");
         out.println(""+getClassName()+"::~"+getClassName()+"() {");



Mime
View raw message