Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAF5F1889F for ; Tue, 4 Aug 2015 20:16:10 +0000 (UTC) Received: (qmail 13577 invoked by uid 500); 4 Aug 2015 20:16:10 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 13450 invoked by uid 500); 4 Aug 2015 20:16:10 -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 13346 invoked by uid 99); 4 Aug 2015 20:16:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2015 20:16:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8A49E35CC; Tue, 4 Aug 2015 20:16:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tabish@apache.org To: commits@activemq.apache.org Date: Tue, 04 Aug 2015 20:16:11 -0000 Message-Id: In-Reply-To: <384c80c225c9417592e8cb3ec0f35250@git.apache.org> References: <384c80c225c9417592e8cb3ec0f35250@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] activemq-cpp git commit: Clean up a number of warnings that are showing up on the Mac compiler suite. Clean up a number of warnings that are showing up on the Mac compiler suite. Project: http://git-wip-us.apache.org/repos/asf/activemq-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-cpp/commit/4cbb7aac Tree: http://git-wip-us.apache.org/repos/asf/activemq-cpp/tree/4cbb7aac Diff: http://git-wip-us.apache.org/repos/asf/activemq-cpp/diff/4cbb7aac Branch: refs/heads/master Commit: 4cbb7aacdb0914ebae84ac1df01b709fc5aec2bf Parents: 9b84e3e Author: Timothy Bish Authored: Tue Aug 4 16:15:58 2015 -0400 Committer: Timothy Bish Committed: Tue Aug 4 16:15:58 2015 -0400 ---------------------------------------------------------------------- .../tool/commands/CommandHeaderGenerator.java | 157 +++++++++---------- .../tool/commands/CommandSourceGenerator.java | 4 +- .../LocalTransactionIdHeaderGenerator.java | 18 ++- .../XATransactionIdHeaderGenerator.java | 22 ++- .../src/main/activemq/commands/ActiveMQQueue.h | 7 + .../activemq/commands/ActiveMQTempDestination.h | 7 + .../main/activemq/commands/ActiveMQTempQueue.h | 4 + .../main/activemq/commands/ActiveMQTempTopic.h | 4 + .../src/main/activemq/commands/ActiveMQTopic.h | 7 + .../src/main/activemq/commands/BrokerId.h | 2 +- .../src/main/activemq/commands/BrokerInfo.cpp | 4 +- .../src/main/activemq/commands/BrokerInfo.h | 24 +-- .../main/activemq/commands/ConnectionControl.h | 18 +-- .../main/activemq/commands/ConnectionError.cpp | 4 +- .../main/activemq/commands/ConnectionError.h | 4 +- .../src/main/activemq/commands/ConnectionId.h | 2 +- .../main/activemq/commands/ConnectionInfo.cpp | 4 +- .../src/main/activemq/commands/ConnectionInfo.h | 22 +-- .../main/activemq/commands/ConsumerControl.cpp | 4 +- .../main/activemq/commands/ConsumerControl.h | 14 +- .../src/main/activemq/commands/ConsumerId.h | 6 +- .../src/main/activemq/commands/ConsumerInfo.cpp | 10 +- .../src/main/activemq/commands/ConsumerInfo.h | 38 ++--- .../src/main/activemq/commands/ControlCommand.h | 2 +- .../activemq/commands/DataArrayResponse.cpp | 2 +- .../main/activemq/commands/DataArrayResponse.h | 2 +- .../src/main/activemq/commands/DataResponse.cpp | 2 +- .../src/main/activemq/commands/DataResponse.h | 2 +- .../main/activemq/commands/DestinationInfo.cpp | 6 +- .../main/activemq/commands/DestinationInfo.h | 10 +- .../src/main/activemq/commands/DiscoveryEvent.h | 4 +- .../activemq/commands/ExceptionResponse.cpp | 2 +- .../main/activemq/commands/ExceptionResponse.h | 2 +- .../main/activemq/commands/IntegerResponse.h | 2 +- .../main/activemq/commands/JournalQueueAck.cpp | 4 +- .../main/activemq/commands/JournalQueueAck.h | 4 +- .../main/activemq/commands/JournalTopicAck.cpp | 6 +- .../main/activemq/commands/JournalTopicAck.h | 12 +- .../src/main/activemq/commands/JournalTrace.h | 2 +- .../activemq/commands/JournalTransaction.cpp | 2 +- .../main/activemq/commands/JournalTransaction.h | 6 +- .../activemq/commands/LocalTransactionId.cpp | 2 +- .../main/activemq/commands/LocalTransactionId.h | 11 +- .../src/main/activemq/commands/Message.cpp | 22 +-- .../src/main/activemq/commands/Message.h | 60 +++---- .../src/main/activemq/commands/MessageAck.cpp | 12 +- .../src/main/activemq/commands/MessageAck.h | 16 +- .../main/activemq/commands/MessageDispatch.cpp | 6 +- .../main/activemq/commands/MessageDispatch.h | 8 +- .../commands/MessageDispatchNotification.cpp | 6 +- .../commands/MessageDispatchNotification.h | 8 +- .../src/main/activemq/commands/MessageId.cpp | 2 +- .../src/main/activemq/commands/MessageId.h | 8 +- .../src/main/activemq/commands/MessagePull.cpp | 6 +- .../src/main/activemq/commands/MessagePull.h | 10 +- .../activemq/commands/NetworkBridgeFilter.cpp | 2 +- .../activemq/commands/NetworkBridgeFilter.h | 6 +- .../src/main/activemq/commands/PartialCommand.h | 4 +- .../src/main/activemq/commands/ProducerAck.cpp | 2 +- .../src/main/activemq/commands/ProducerAck.h | 4 +- .../src/main/activemq/commands/ProducerId.h | 6 +- .../src/main/activemq/commands/ProducerInfo.cpp | 6 +- .../src/main/activemq/commands/ProducerInfo.h | 10 +- .../src/main/activemq/commands/RemoveInfo.cpp | 2 +- .../src/main/activemq/commands/RemoveInfo.h | 4 +- .../commands/RemoveSubscriptionInfo.cpp | 2 +- .../activemq/commands/RemoveSubscriptionInfo.h | 6 +- .../src/main/activemq/commands/ReplayCommand.h | 4 +- .../src/main/activemq/commands/Response.h | 2 +- .../src/main/activemq/commands/SessionId.h | 4 +- .../src/main/activemq/commands/SessionInfo.cpp | 2 +- .../src/main/activemq/commands/SessionInfo.h | 2 +- .../main/activemq/commands/SubscriptionInfo.cpp | 4 +- .../main/activemq/commands/SubscriptionInfo.h | 12 +- .../main/activemq/commands/TransactionInfo.cpp | 4 +- .../main/activemq/commands/TransactionInfo.h | 6 +- .../main/activemq/commands/XATransactionId.h | 13 +- .../main/activemq/core/ActiveMQXAConnection.h | 4 + .../http/HttpDiscoveryAgentFactory.cpp | 2 +- .../internal/net/ssl/openssl/OpenSSLSocket.h | 7 +- activemq-cpp/src/main/decaf/net/Socket.h | 24 +-- activemq-cpp/src/main/decaf/net/SocketFactory.h | 10 +- .../src/main/decaf/net/ssl/SSLSocketFactory.h | 6 +- activemq-cpp/src/main/decaf/util/AbstractSet.h | 2 + activemq-cpp/src/main/decaf/util/HashMap.h | 4 +- activemq-cpp/src/main/decaf/util/HashSet.h | 2 +- .../src/main/decaf/util/LinkedHashMap.h | 4 + .../main/decaf/util/concurrent/ConcurrentMap.h | 4 + .../decaf/util/concurrent/ConcurrentStlMap.h | 10 +- 89 files changed, 452 insertions(+), 369 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java index 29b0c4a..5d9a2fd 100644 --- a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java +++ b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandHeaderGenerator.java @@ -24,7 +24,7 @@ import org.codehaus.jam.JProperty; public class CommandHeaderGenerator extends CommandCodeGenerator { - public void generate( PrintWriter out ) { + public void generate(PrintWriter out) { // Start with the license. generateLicence(out); @@ -32,8 +32,8 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { populateIncludeFilesSet(); populateBaseClassesSet(); - out.println("#ifndef _ACTIVEMQ_COMMANDS_"+getClassName().toUpperCase()+"_H_"); - out.println("#define _ACTIVEMQ_COMMANDS_"+getClassName().toUpperCase()+"_H_"); + out.println("#ifndef _ACTIVEMQ_COMMANDS_" + getClassName().toUpperCase() + "_H_"); + out.println("#define _ACTIVEMQ_COMMANDS_" + getClassName().toUpperCase() + "_H_"); out.println(""); out.println("// Turn off warning message for ignored exception specification"); out.println("#ifdef _MSC_VER"); @@ -41,21 +41,21 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { out.println("#endif"); out.println(""); - for( String include : getIncludeFiles() ) { - if( include != null ) { - out.println("#include "+include); + for (String include : getIncludeFiles()) { + if (include != null) { + out.println("#include " + include); } } out.println(""); - generateNamespaceWrapper( out ); - generateForwardDeclarations( out ); + generateNamespaceWrapper(out); + generateForwardDeclarations(out); out.println(" using decaf::lang::Pointer;"); out.println(""); out.println(" /*"); out.println(" *"); - out.println(" * Command code for OpenWire format for "+getClassName() ); + out.println(" * Command code for OpenWire format for " + getClassName()); out.println(" *"); out.println(" * NOTE!: This file is auto generated - do not modify!"); out.println(" * if you need to make a change, please see the Java Classes"); @@ -63,78 +63,78 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { out.println(" *"); out.println(" */"); - generateClassDefinition( out ); - generateProperties( out ); + generateClassDefinition(out); + generateProperties(out); - if( !isAssignable() ) { + if (!isAssignable()) { out.println(" private:"); out.println(""); - out.println(" "+getClassName()+"(const "+getClassName()+"&);"); - out.println(" "+getClassName()+"& operator= (const "+getClassName()+"&);"); + out.println(" " + getClassName() + "(const " + getClassName() + "&);"); + out.println(" " + getClassName() + "& operator= (const " + getClassName() + "&);"); out.println(""); } out.println(" public:"); out.println(""); - out.println(" "+getClassName()+"();"); + out.println(" " + getClassName() + "();"); out.println(""); - if( isAssignable() ) { - out.println(" "+getClassName()+"(const "+getClassName()+"& other);"); + if (isAssignable()) { + out.println(" " + getClassName() + "(const " + getClassName() + "& other);"); out.println(""); } - generateAdditionalConstructors( out ); + generateAdditionalConstructors(out); - out.println(" virtual ~"+getClassName()+"();"); + out.println(" virtual ~" + getClassName() + "();"); out.println(""); out.println(" virtual unsigned char getDataStructureType() const;"); out.println(""); - out.println(" virtual "+getClassName()+"* cloneDataStructure() const;"); + out.println(" virtual " + getClassName() + "* cloneDataStructure() const;"); out.println(""); out.println(" virtual void copyDataStructure(const DataStructure* src);"); out.println(""); out.println(" virtual std::string toString() const;"); out.println(""); - out.println(" virtual bool equals(const DataStructure* value) const;" ); + out.println(" virtual bool equals(const DataStructure* value) const;"); out.println(""); - generateAdditonalMembers( out ); - generatePropertyAccessors( out ); + generateAdditonalMembers(out); + generatePropertyAccessors(out); - if( isComparable() ) { - out.println(" virtual int compareTo(const "+getClassName()+"& value) const;"); + if (isComparable()) { + out.println(" virtual int compareTo(const " + getClassName() + "& value) const;"); out.println(""); - out.println(" virtual bool equals(const "+getClassName()+"& value) const;"); + out.println(" virtual bool equals(const " + getClassName() + "& value) const;"); out.println(""); - out.println(" virtual bool operator==(const "+getClassName()+"& value) const;"); + out.println(" virtual bool operator==(const " + getClassName() + "& value) const;"); out.println(""); - out.println(" virtual bool operator<(const "+getClassName()+"& value) const;"); + out.println(" virtual bool operator<(const " + getClassName() + "& value) const;"); out.println(""); } - if( isAssignable() ) { - out.println(" "+getClassName()+"& operator= (const "+getClassName()+"& other);"); + if (isAssignable()) { + out.println(" " + getClassName() + "& operator= (const " + getClassName() + "& other);"); out.println(""); } - if( isHashable() ) { + if (isHashable()) { out.println(" int getHashCode() const;"); out.println(""); } - if( isGenIsClass() ) { + if (isGenIsClass()) { out.println(" /**"); - out.println(" * @return an answer of true to the is"+getClassName()+"() query."); + out.println(" * @return an answer of true to the is" + getClassName() + "() query."); out.println(" */"); - out.println(" virtual bool is"+getClassName()+"() const {"); + out.println(" virtual bool is" + getClassName() + "() const {"); out.println(" return true;"); out.println(" }"); out.println(""); } - if( getBaseClassName().equals( "BaseCommand" ) ) { - out.println(" virtual Pointer visit(activemq::state::CommandVisitor* visitor);" ); + if (getBaseClassName().equals("BaseCommand")) { + out.println(" virtual Pointer visit(activemq::state::CommandVisitor* visitor);"); out.println(""); } @@ -142,7 +142,7 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { out.println(""); out.println("}}"); out.println(""); - out.println("#endif /*_ACTIVEMQ_COMMANDS_"+getClassName().toUpperCase()+"_H_*/"); + out.println("#endif /*_ACTIVEMQ_COMMANDS_" + getClassName().toUpperCase() + "_H_*/"); } protected void populateIncludeFilesSet() { @@ -152,22 +152,20 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { includes.add(""); includes.add(""); includes.add(""); - includes.add(""); + includes.add(""); includes.add(""); - if( isComparable() ) { + if (isComparable()) { includes.add(""); } - for( JProperty property : getProperties() ) { - if( !property.getType().isPrimitiveType() && + for (JProperty property : getProperties()) { + if (!property.getType().isPrimitiveType() && !property.getType().getSimpleName().equals("String") && - !property.getType().getSimpleName().equals("ByteSequence") ) - { + !property.getType().getSimpleName().equals("ByteSequence")) { - if( toHeaderFileName( property.getType() ) != null ) { - includes.add( - ""); + if (toHeaderFileName(property.getType()) != null) { + includes.add(""); } } } @@ -177,27 +175,27 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { Set classes = getBaseClasses(); classes.add(getBaseClassName()); - if( isComparable() ) { - classes.add("decaf::lang::Comparable<"+getClassName()+">"); + if (isComparable()) { + classes.add("decaf::lang::Comparable<" + getClassName() + ">"); } } - protected void generateNamespaceWrapper( PrintWriter out ) { + protected void generateNamespaceWrapper(PrintWriter out) { out.println("namespace activemq {"); out.println("namespace commands {"); out.println(""); } - protected void generateForwardDeclarations( PrintWriter out ) { + protected void generateForwardDeclarations(PrintWriter out) { } - protected void generateClassDefinition( PrintWriter out ) { - out.print(" class AMQCPP_API "+getClassName()+" : " ); + protected void generateClassDefinition(PrintWriter out) { + out.print(" class AMQCPP_API " + getClassName() + " : "); Iterator iter = this.getBaseClasses().iterator(); - while(iter.hasNext()) { + while (iter.hasNext()) { out.print("public " + iter.next()); - if( iter.hasNext() ) { + if (iter.hasNext()) { out.print(", "); } else { out.println(" {"); @@ -205,75 +203,70 @@ public class CommandHeaderGenerator extends CommandCodeGenerator { } } - protected void generateProperties( PrintWriter out ) { + protected void generateProperties(PrintWriter out) { out.println(" protected:"); out.println(""); - for( JProperty property : getProperties() ) { + for (JProperty property : getProperties()) { String type = toCppType(property.getType()); String name = decapitalize(property.getSimpleName()); - if( !property.getType().isPrimitiveType() && - !property.getType().getSimpleName().equals("ByteSequence") && - !property.getType().getSimpleName().equals("String") && - !type.startsWith("std::vector") ) { + if (!property.getType().isPrimitiveType() && !property.getType().getSimpleName().equals("ByteSequence") && + !property.getType().getSimpleName().equals("String") && !type.startsWith("std::vector")) { type = "Pointer<" + type + ">"; } - out.println(" "+type+" "+name+";"); + out.println(" " + type + " " + name + ";"); } out.println(""); out.println(" public:"); out.println(""); - out.println(" const static unsigned char ID_"+ - getClassName().toUpperCase()+" = "+getOpenWireOpCode()+";"); + out.println(" const static unsigned char ID_" + getClassName().toUpperCase() + " = " + getOpenWireOpCode() + ";"); out.println(""); - if( isComparable() ) { - out.println(" typedef decaf::lang::PointerComparator<"+getClassName()+"> COMPARATOR;"); + + if (isComparable()) { + out.println(" typedef decaf::lang::PointerComparator<" + getClassName() + "> COMPARATOR;"); out.println(""); } } - protected void generateAdditionalConstructors( PrintWriter out ) { + protected void generateAdditionalConstructors(PrintWriter out) { } - protected void generateAdditonalMembers( PrintWriter out ) { + protected void generateAdditonalMembers(PrintWriter out) { } - protected void generatePropertyAccessors( PrintWriter out ) { + protected void generatePropertyAccessors(PrintWriter out) { - for( JProperty property : getProperties() ) { + for (JProperty property : getProperties()) { String type = toCppType(property.getType()); String propertyName = property.getSimpleName(); String parameterName = decapitalize(propertyName); String constness = ""; - if( !property.getType().isPrimitiveType() && + if (!property.getType().isPrimitiveType() && !property.getType().getSimpleName().equals("ByteSequence") && !property.getType().getSimpleName().equals("String") && - !type.startsWith("std::vector") ) { - - type = "Pointer<" + type + ">&"; - constness = "const "; - } else if( property.getType().getSimpleName().equals("String") || - type.startsWith("std::vector") ) { + !type.startsWith("std::vector")) { + type = "Pointer<" + type + ">&"; + constness = "const "; + } else if (property.getType().getSimpleName().equals("String") || type.startsWith("std::vector")) { type = type + "&"; constness = "const "; } - if( property.getType().isPrimitiveType() ) { - out.println(" virtual "+type+" "+property.getGetter().getSimpleName()+"() const;"); + if (property.getType().isPrimitiveType()) { + out.println(" virtual " + type + " " + property.getGetter().getSimpleName() + "() const;"); } else { - out.println(" virtual const "+type+" "+property.getGetter().getSimpleName()+"() const;"); - out.println(" virtual "+type+" "+property.getGetter().getSimpleName()+"();"); + out.println(" virtual const " + type + " " + property.getGetter().getSimpleName() + "() const;"); + out.println(" virtual " + type + " " + property.getGetter().getSimpleName() + "();"); } - out.println(" virtual void "+property.getSetter().getSimpleName()+"( "+constness+type+" "+parameterName+" );"); + out.println(" virtual void " + property.getSetter().getSimpleName() + "(" + constness + type + " " + parameterName + ");"); out.println(""); } } - } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java index ca6ea0f..2aec094 100644 --- a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java +++ b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/CommandSourceGenerator.java @@ -396,7 +396,7 @@ public class CommandSourceGenerator extends CommandCodeGenerator { out.println(" for (size_t i" + parameterName + " = 0; i" + parameterName + " < this->"+getter+"().size(); ++i" + parameterName + ") {"); out.println(" if (this->"+getter+"()[i"+parameterName+"] != NULL ) {" ); - out.println(" if (!this->"+getter+"()[i"+parameterName+"]->equals( valuePtr->"+getter+"()[i"+parameterName+"].get())) {" ); + out.println(" if (!this->"+getter+"()[i"+parameterName+"]->equals(valuePtr->"+getter+"()[i"+parameterName+"].get())) {" ); out.println(" return false;"); out.println(" }"); out.println(" } else if (valuePtr->"+getter+"()[i"+parameterName+"] != NULL) {"); @@ -413,7 +413,7 @@ public class CommandSourceGenerator extends CommandCodeGenerator { out.println(" }"); } else { out.println(" if (this->"+getter+"() != NULL) {"); - out.println(" if (!this->"+getter+"()->equals( valuePtr->"+getter+"().get())) {" ); + out.println(" if (!this->"+getter+"()->equals(valuePtr->"+getter+"().get())) {" ); out.println(" return false;"); out.println(" }"); out.println(" } else if (valuePtr->"+getter+"() != NULL) {"); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/LocalTransactionIdHeaderGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/LocalTransactionIdHeaderGenerator.java b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/LocalTransactionIdHeaderGenerator.java index b03ad16..9ed7311 100644 --- a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/LocalTransactionIdHeaderGenerator.java +++ b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/LocalTransactionIdHeaderGenerator.java @@ -20,12 +20,26 @@ import java.io.PrintWriter; public class LocalTransactionIdHeaderGenerator extends CommandHeaderGenerator { - protected void generateAdditonalMembers( PrintWriter out ) { + protected void generateAdditonalMembers(PrintWriter out) { out.println(" virtual bool isLocalTransactionId() const {"); out.println(" return true;"); out.println(" }"); out.println(""); - super.generateAdditonalMembers( out ); + super.generateAdditonalMembers(out); + } + + protected void generateProperties(PrintWriter out) { + out.println(" protected:"); + out.println(""); + + out.println(" using TransactionId::compareTo;"); + out.println(" using TransactionId::equals;"); + out.println(" using TransactionId::operator <;"); + out.println(" using TransactionId::operator==;"); + + out.println(""); + + super.generateProperties(out); } } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdHeaderGenerator.java ---------------------------------------------------------------------- diff --git a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdHeaderGenerator.java b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdHeaderGenerator.java index e984c5d..0807805 100644 --- a/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdHeaderGenerator.java +++ b/activemq-cpp-openwire-generator/src/main/java/org/apache/activemq/openwire/tool/commands/XATransactionIdHeaderGenerator.java @@ -28,8 +28,8 @@ public class XATransactionIdHeaderGenerator extends CommandHeaderGenerator { super.populateIncludeFilesSet(); } - protected void generateAdditionalConstructors( PrintWriter out ) { - out.println(" "+getClassName()+"( const cms::Xid* xid );"); + protected void generateAdditionalConstructors(PrintWriter out) { + out.println(" " + getClassName() + "( const cms::Xid* xid );"); out.println(""); super.generateAdditionalConstructors(out); @@ -41,7 +41,21 @@ public class XATransactionIdHeaderGenerator extends CommandHeaderGenerator { classes.add("cms::Xid"); } - protected void generateAdditonalMembers( PrintWriter out ) { + protected void generateProperties(PrintWriter out) { + out.println(" protected:"); + out.println(""); + + out.println(" using TransactionId::compareTo;"); + out.println(" using TransactionId::equals;"); + out.println(" using TransactionId::operator <;"); + out.println(" using TransactionId::operator==;"); + + out.println(""); + + super.generateProperties(out); + } + + protected void generateAdditonalMembers(PrintWriter out) { out.println(" virtual bool isXATransactionId() const {"); out.println(" return true;"); out.println(" }"); @@ -58,6 +72,6 @@ public class XATransactionIdHeaderGenerator extends CommandHeaderGenerator { out.println(" virtual int getGlobalTransactionId(unsigned char* buffer, int size) const;"); out.println(""); - super.generateAdditonalMembers( out ); + super.generateAdditonalMembers(out); } } http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h b/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h index 905ffeb..bcf4770 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQQueue.h @@ -40,6 +40,13 @@ namespace commands { const static unsigned char ID_ACTIVEMQQUEUE = 100; + public: + + using ActiveMQDestination::compareTo; + using ActiveMQDestination::equals; + using ActiveMQDestination::operator<; + using ActiveMQDestination::operator==; + private: ActiveMQQueue(const ActiveMQQueue&); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h b/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h index 99b9294..11cfe18 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQTempDestination.h @@ -34,6 +34,13 @@ namespace commands{ class AMQCPP_API ActiveMQTempDestination : public ActiveMQDestination, public cms::Closeable, public decaf::lang::Comparable { + public: + + using ActiveMQDestination::compareTo; + using ActiveMQDestination::equals; + using ActiveMQDestination::operator<; + using ActiveMQDestination::operator==; + protected: /** http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h b/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h index aab278f..ef3ddff 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQTempQueue.h @@ -33,6 +33,10 @@ namespace commands { const static unsigned char ID_ACTIVEMQTEMPQUEUE = 102; + public: + + using ActiveMQTempDestination::equals; + private: ActiveMQTempQueue(const ActiveMQTempQueue&); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h b/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h index 33009fe..d9a5d93 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQTempTopic.h @@ -33,6 +33,10 @@ namespace commands { const static unsigned char ID_ACTIVEMQTEMPTOPIC = 103; + public: + + using ActiveMQTempDestination::equals; + private: ActiveMQTempTopic(const ActiveMQTempTopic&); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h b/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h index 26615b7..8f289dd 100644 --- a/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h +++ b/activemq-cpp/src/main/activemq/commands/ActiveMQTopic.h @@ -35,6 +35,13 @@ namespace commands { const static unsigned char ID_ACTIVEMQTOPIC = 101; + public: + + using ActiveMQDestination::compareTo; + using ActiveMQDestination::equals; + using ActiveMQDestination::operator<; + using ActiveMQDestination::operator==; + private: ActiveMQTopic(const ActiveMQTopic&); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/BrokerId.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/BrokerId.h b/activemq-cpp/src/main/activemq/commands/BrokerId.h index 50d10c7..ae833f8 100644 --- a/activemq-cpp/src/main/activemq/commands/BrokerId.h +++ b/activemq-cpp/src/main/activemq/commands/BrokerId.h @@ -75,7 +75,7 @@ namespace commands { virtual const std::string& getValue() const; virtual std::string& getValue(); - virtual void setValue( const std::string& value ); + virtual void setValue(const std::string& value); virtual int compareTo(const BrokerId& value) const; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp b/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp index 02931c3..0f64ad4 100644 --- a/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp +++ b/activemq-cpp/src/main/activemq/commands/BrokerInfo.cpp @@ -166,7 +166,7 @@ bool BrokerInfo::equals(const DataStructure* value) const { } if (this->getBrokerId() != NULL) { - if (!this->getBrokerId()->equals( valuePtr->getBrokerId().get())) { + if (!this->getBrokerId()->equals(valuePtr->getBrokerId().get())) { return false; } } else if (valuePtr->getBrokerId() != NULL) { @@ -177,7 +177,7 @@ bool BrokerInfo::equals(const DataStructure* value) const { } for (size_t ipeerBrokerInfos = 0; ipeerBrokerInfos < this->getPeerBrokerInfos().size(); ++ipeerBrokerInfos) { if (this->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL ) { - if (!this->getPeerBrokerInfos()[ipeerBrokerInfos]->equals( valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos].get())) { + if (!this->getPeerBrokerInfos()[ipeerBrokerInfos]->equals(valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos].get())) { return false; } } else if (valuePtr->getPeerBrokerInfos()[ipeerBrokerInfos] != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/BrokerInfo.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/BrokerInfo.h b/activemq-cpp/src/main/activemq/commands/BrokerInfo.h index 3465704..128a769 100644 --- a/activemq-cpp/src/main/activemq/commands/BrokerInfo.h +++ b/activemq-cpp/src/main/activemq/commands/BrokerInfo.h @@ -88,45 +88,45 @@ namespace commands { virtual const Pointer& getBrokerId() const; virtual Pointer& getBrokerId(); - virtual void setBrokerId( const Pointer& brokerId ); + virtual void setBrokerId(const Pointer& brokerId); virtual const std::string& getBrokerURL() const; virtual std::string& getBrokerURL(); - virtual void setBrokerURL( const std::string& brokerURL ); + virtual void setBrokerURL(const std::string& brokerURL); virtual const std::vector< decaf::lang::Pointer >& getPeerBrokerInfos() const; virtual std::vector< decaf::lang::Pointer >& getPeerBrokerInfos(); - virtual void setPeerBrokerInfos( const std::vector< decaf::lang::Pointer >& peerBrokerInfos ); + virtual void setPeerBrokerInfos(const std::vector< decaf::lang::Pointer >& peerBrokerInfos); virtual const std::string& getBrokerName() const; virtual std::string& getBrokerName(); - virtual void setBrokerName( const std::string& brokerName ); + virtual void setBrokerName(const std::string& brokerName); virtual bool isSlaveBroker() const; - virtual void setSlaveBroker( bool slaveBroker ); + virtual void setSlaveBroker(bool slaveBroker); virtual bool isMasterBroker() const; - virtual void setMasterBroker( bool masterBroker ); + virtual void setMasterBroker(bool masterBroker); virtual bool isFaultTolerantConfiguration() const; - virtual void setFaultTolerantConfiguration( bool faultTolerantConfiguration ); + virtual void setFaultTolerantConfiguration(bool faultTolerantConfiguration); virtual bool isDuplexConnection() const; - virtual void setDuplexConnection( bool duplexConnection ); + virtual void setDuplexConnection(bool duplexConnection); virtual bool isNetworkConnection() const; - virtual void setNetworkConnection( bool networkConnection ); + virtual void setNetworkConnection(bool networkConnection); virtual long long getConnectionId() const; - virtual void setConnectionId( long long connectionId ); + virtual void setConnectionId(long long connectionId); virtual const std::string& getBrokerUploadUrl() const; virtual std::string& getBrokerUploadUrl(); - virtual void setBrokerUploadUrl( const std::string& brokerUploadUrl ); + virtual void setBrokerUploadUrl(const std::string& brokerUploadUrl); virtual const std::string& getNetworkProperties() const; virtual std::string& getNetworkProperties(); - virtual void setNetworkProperties( const std::string& networkProperties ); + virtual void setNetworkProperties(const std::string& networkProperties); /** * @return an answer of true to the isBrokerInfo() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConnectionControl.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConnectionControl.h b/activemq-cpp/src/main/activemq/commands/ConnectionControl.h index f729577..11424e0 100644 --- a/activemq-cpp/src/main/activemq/commands/ConnectionControl.h +++ b/activemq-cpp/src/main/activemq/commands/ConnectionControl.h @@ -82,34 +82,34 @@ namespace commands { virtual bool equals(const DataStructure* value) const; virtual bool isClose() const; - virtual void setClose( bool close ); + virtual void setClose(bool close); virtual bool isExit() const; - virtual void setExit( bool exit ); + virtual void setExit(bool exit); virtual bool isFaultTolerant() const; - virtual void setFaultTolerant( bool faultTolerant ); + virtual void setFaultTolerant(bool faultTolerant); virtual bool isResume() const; - virtual void setResume( bool resume ); + virtual void setResume(bool resume); virtual bool isSuspend() const; - virtual void setSuspend( bool suspend ); + virtual void setSuspend(bool suspend); virtual const std::string& getConnectedBrokers() const; virtual std::string& getConnectedBrokers(); - virtual void setConnectedBrokers( const std::string& connectedBrokers ); + virtual void setConnectedBrokers(const std::string& connectedBrokers); virtual const std::string& getReconnectTo() const; virtual std::string& getReconnectTo(); - virtual void setReconnectTo( const std::string& reconnectTo ); + virtual void setReconnectTo(const std::string& reconnectTo); virtual bool isRebalanceConnection() const; - virtual void setRebalanceConnection( bool rebalanceConnection ); + virtual void setRebalanceConnection(bool rebalanceConnection); virtual const std::vector& getToken() const; virtual std::vector& getToken(); - virtual void setToken( const std::vector& token ); + virtual void setToken(const std::vector& token); /** * @return an answer of true to the isConnectionControl() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp b/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp index 180e69c..a65a9ce 100644 --- a/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp +++ b/activemq-cpp/src/main/activemq/commands/ConnectionError.cpp @@ -126,14 +126,14 @@ bool ConnectionError::equals(const DataStructure* value) const { } if (this->getException() != NULL) { - if (!this->getException()->equals( valuePtr->getException().get())) { + if (!this->getException()->equals(valuePtr->getException().get())) { return false; } } else if (valuePtr->getException() != NULL) { return false; } if (this->getConnectionId() != NULL) { - if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) { + if (!this->getConnectionId()->equals(valuePtr->getConnectionId().get())) { return false; } } else if (valuePtr->getConnectionId() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConnectionError.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConnectionError.h b/activemq-cpp/src/main/activemq/commands/ConnectionError.h index 3a4b362..1d76bb3 100644 --- a/activemq-cpp/src/main/activemq/commands/ConnectionError.h +++ b/activemq-cpp/src/main/activemq/commands/ConnectionError.h @@ -78,11 +78,11 @@ namespace commands { virtual const Pointer& getException() const; virtual Pointer& getException(); - virtual void setException( const Pointer& exception ); + virtual void setException(const Pointer& exception); virtual const Pointer& getConnectionId() const; virtual Pointer& getConnectionId(); - virtual void setConnectionId( const Pointer& connectionId ); + virtual void setConnectionId(const Pointer& connectionId); /** * @return an answer of true to the isConnectionError() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConnectionId.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConnectionId.h b/activemq-cpp/src/main/activemq/commands/ConnectionId.h index 2020725..f298ee8 100644 --- a/activemq-cpp/src/main/activemq/commands/ConnectionId.h +++ b/activemq-cpp/src/main/activemq/commands/ConnectionId.h @@ -85,7 +85,7 @@ namespace commands { virtual const std::string& getValue() const; virtual std::string& getValue(); - virtual void setValue( const std::string& value ); + virtual void setValue(const std::string& value); virtual int compareTo(const ConnectionId& value) const; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp b/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp index 6318738..9e0cf6b 100644 --- a/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp +++ b/activemq-cpp/src/main/activemq/commands/ConnectionInfo.cpp @@ -162,7 +162,7 @@ bool ConnectionInfo::equals(const DataStructure* value) const { } if (this->getConnectionId() != NULL) { - if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) { + if (!this->getConnectionId()->equals(valuePtr->getConnectionId().get())) { return false; } } else if (valuePtr->getConnectionId() != NULL) { @@ -179,7 +179,7 @@ bool ConnectionInfo::equals(const DataStructure* value) const { } for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) { if (this->getBrokerPath()[ibrokerPath] != NULL ) { - if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) { + if (!this->getBrokerPath()[ibrokerPath]->equals(valuePtr->getBrokerPath()[ibrokerPath].get())) { return false; } } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h b/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h index 17d80f9..da17bc1 100644 --- a/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h +++ b/activemq-cpp/src/main/activemq/commands/ConnectionInfo.h @@ -90,42 +90,42 @@ namespace commands { virtual const Pointer& getConnectionId() const; virtual Pointer& getConnectionId(); - virtual void setConnectionId( const Pointer& connectionId ); + virtual void setConnectionId(const Pointer& connectionId); virtual const std::string& getClientId() const; virtual std::string& getClientId(); - virtual void setClientId( const std::string& clientId ); + virtual void setClientId(const std::string& clientId); virtual const std::string& getPassword() const; virtual std::string& getPassword(); - virtual void setPassword( const std::string& password ); + virtual void setPassword(const std::string& password); virtual const std::string& getUserName() const; virtual std::string& getUserName(); - virtual void setUserName( const std::string& userName ); + virtual void setUserName(const std::string& userName); virtual const std::vector< decaf::lang::Pointer >& getBrokerPath() const; virtual std::vector< decaf::lang::Pointer >& getBrokerPath(); - virtual void setBrokerPath( const std::vector< decaf::lang::Pointer >& brokerPath ); + virtual void setBrokerPath(const std::vector< decaf::lang::Pointer >& brokerPath); virtual bool isBrokerMasterConnector() const; - virtual void setBrokerMasterConnector( bool brokerMasterConnector ); + virtual void setBrokerMasterConnector(bool brokerMasterConnector); virtual bool isManageable() const; - virtual void setManageable( bool manageable ); + virtual void setManageable(bool manageable); virtual bool isClientMaster() const; - virtual void setClientMaster( bool clientMaster ); + virtual void setClientMaster(bool clientMaster); virtual bool isFaultTolerant() const; - virtual void setFaultTolerant( bool faultTolerant ); + virtual void setFaultTolerant(bool faultTolerant); virtual bool isFailoverReconnect() const; - virtual void setFailoverReconnect( bool failoverReconnect ); + virtual void setFailoverReconnect(bool failoverReconnect); virtual const std::string& getClientIp() const; virtual std::string& getClientIp(); - virtual void setClientIp( const std::string& clientIp ); + virtual void setClientIp(const std::string& clientIp); /** * @return an answer of true to the isConnectionInfo() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp b/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp index dc36db8..488681d 100644 --- a/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp +++ b/activemq-cpp/src/main/activemq/commands/ConsumerControl.cpp @@ -141,7 +141,7 @@ bool ConsumerControl::equals(const DataStructure* value) const { } if (this->getDestination() != NULL) { - if (!this->getDestination()->equals( valuePtr->getDestination().get())) { + if (!this->getDestination()->equals(valuePtr->getDestination().get())) { return false; } } else if (valuePtr->getDestination() != NULL) { @@ -151,7 +151,7 @@ bool ConsumerControl::equals(const DataStructure* value) const { return false; } if (this->getConsumerId() != NULL) { - if (!this->getConsumerId()->equals( valuePtr->getConsumerId().get())) { + if (!this->getConsumerId()->equals(valuePtr->getConsumerId().get())) { return false; } } else if (valuePtr->getConsumerId() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConsumerControl.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerControl.h b/activemq-cpp/src/main/activemq/commands/ConsumerControl.h index ba9e7d6..a7a1643 100644 --- a/activemq-cpp/src/main/activemq/commands/ConsumerControl.h +++ b/activemq-cpp/src/main/activemq/commands/ConsumerControl.h @@ -83,26 +83,26 @@ namespace commands { virtual const Pointer& getDestination() const; virtual Pointer& getDestination(); - virtual void setDestination( const Pointer& destination ); + virtual void setDestination(const Pointer& destination); virtual bool isClose() const; - virtual void setClose( bool close ); + virtual void setClose(bool close); virtual const Pointer& getConsumerId() const; virtual Pointer& getConsumerId(); - virtual void setConsumerId( const Pointer& consumerId ); + virtual void setConsumerId(const Pointer& consumerId); virtual int getPrefetch() const; - virtual void setPrefetch( int prefetch ); + virtual void setPrefetch(int prefetch); virtual bool isFlush() const; - virtual void setFlush( bool flush ); + virtual void setFlush(bool flush); virtual bool isStart() const; - virtual void setStart( bool start ); + virtual void setStart(bool start); virtual bool isStop() const; - virtual void setStop( bool stop ); + virtual void setStop(bool stop); /** * @return an answer of true to the isConsumerControl() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConsumerId.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerId.h b/activemq-cpp/src/main/activemq/commands/ConsumerId.h index 923d2b5..ecbb18a 100644 --- a/activemq-cpp/src/main/activemq/commands/ConsumerId.h +++ b/activemq-cpp/src/main/activemq/commands/ConsumerId.h @@ -86,13 +86,13 @@ namespace commands { virtual const std::string& getConnectionId() const; virtual std::string& getConnectionId(); - virtual void setConnectionId( const std::string& connectionId ); + virtual void setConnectionId(const std::string& connectionId); virtual long long getSessionId() const; - virtual void setSessionId( long long sessionId ); + virtual void setSessionId(long long sessionId); virtual long long getValue() const; - virtual void setValue( long long value ); + virtual void setValue(long long value); virtual int compareTo(const ConsumerId& value) const; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp index 475df9d..6943a08 100644 --- a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp +++ b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.cpp @@ -211,7 +211,7 @@ bool ConsumerInfo::equals(const DataStructure* value) const { } if (this->getConsumerId() != NULL) { - if (!this->getConsumerId()->equals( valuePtr->getConsumerId().get())) { + if (!this->getConsumerId()->equals(valuePtr->getConsumerId().get())) { return false; } } else if (valuePtr->getConsumerId() != NULL) { @@ -221,7 +221,7 @@ bool ConsumerInfo::equals(const DataStructure* value) const { return false; } if (this->getDestination() != NULL) { - if (!this->getDestination()->equals( valuePtr->getDestination().get())) { + if (!this->getDestination()->equals(valuePtr->getDestination().get())) { return false; } } else if (valuePtr->getDestination() != NULL) { @@ -259,7 +259,7 @@ bool ConsumerInfo::equals(const DataStructure* value) const { } for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) { if (this->getBrokerPath()[ibrokerPath] != NULL ) { - if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) { + if (!this->getBrokerPath()[ibrokerPath]->equals(valuePtr->getBrokerPath()[ibrokerPath].get())) { return false; } } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) { @@ -267,7 +267,7 @@ bool ConsumerInfo::equals(const DataStructure* value) const { } } if (this->getAdditionalPredicate() != NULL) { - if (!this->getAdditionalPredicate()->equals( valuePtr->getAdditionalPredicate().get())) { + if (!this->getAdditionalPredicate()->equals(valuePtr->getAdditionalPredicate().get())) { return false; } } else if (valuePtr->getAdditionalPredicate() != NULL) { @@ -284,7 +284,7 @@ bool ConsumerInfo::equals(const DataStructure* value) const { } for (size_t inetworkConsumerPath = 0; inetworkConsumerPath < this->getNetworkConsumerPath().size(); ++inetworkConsumerPath) { if (this->getNetworkConsumerPath()[inetworkConsumerPath] != NULL ) { - if (!this->getNetworkConsumerPath()[inetworkConsumerPath]->equals( valuePtr->getNetworkConsumerPath()[inetworkConsumerPath].get())) { + if (!this->getNetworkConsumerPath()[inetworkConsumerPath]->equals(valuePtr->getNetworkConsumerPath()[inetworkConsumerPath].get())) { return false; } } else if (valuePtr->getNetworkConsumerPath()[inetworkConsumerPath] != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h index fef27cb..8c12eea 100644 --- a/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h +++ b/activemq-cpp/src/main/activemq/commands/ConsumerInfo.h @@ -113,68 +113,68 @@ namespace commands { virtual const Pointer& getConsumerId() const; virtual Pointer& getConsumerId(); - virtual void setConsumerId( const Pointer& consumerId ); + virtual void setConsumerId(const Pointer& consumerId); virtual bool isBrowser() const; - virtual void setBrowser( bool browser ); + virtual void setBrowser(bool browser); virtual const Pointer& getDestination() const; virtual Pointer& getDestination(); - virtual void setDestination( const Pointer& destination ); + virtual void setDestination(const Pointer& destination); virtual int getPrefetchSize() const; - virtual void setPrefetchSize( int prefetchSize ); + virtual void setPrefetchSize(int prefetchSize); virtual int getMaximumPendingMessageLimit() const; - virtual void setMaximumPendingMessageLimit( int maximumPendingMessageLimit ); + virtual void setMaximumPendingMessageLimit(int maximumPendingMessageLimit); virtual bool isDispatchAsync() const; - virtual void setDispatchAsync( bool dispatchAsync ); + virtual void setDispatchAsync(bool dispatchAsync); virtual const std::string& getSelector() const; virtual std::string& getSelector(); - virtual void setSelector( const std::string& selector ); + virtual void setSelector(const std::string& selector); virtual const std::string& getClientId() const; virtual std::string& getClientId(); - virtual void setClientId( const std::string& clientId ); + virtual void setClientId(const std::string& clientId); virtual const std::string& getSubscriptionName() const; virtual std::string& getSubscriptionName(); - virtual void setSubscriptionName( const std::string& subscriptionName ); + virtual void setSubscriptionName(const std::string& subscriptionName); virtual bool isNoLocal() const; - virtual void setNoLocal( bool noLocal ); + virtual void setNoLocal(bool noLocal); virtual bool isExclusive() const; - virtual void setExclusive( bool exclusive ); + virtual void setExclusive(bool exclusive); virtual bool isRetroactive() const; - virtual void setRetroactive( bool retroactive ); + virtual void setRetroactive(bool retroactive); virtual unsigned char getPriority() const; - virtual void setPriority( unsigned char priority ); + virtual void setPriority(unsigned char priority); virtual const std::vector< decaf::lang::Pointer >& getBrokerPath() const; virtual std::vector< decaf::lang::Pointer >& getBrokerPath(); - virtual void setBrokerPath( const std::vector< decaf::lang::Pointer >& brokerPath ); + virtual void setBrokerPath(const std::vector< decaf::lang::Pointer >& brokerPath); virtual const Pointer& getAdditionalPredicate() const; virtual Pointer& getAdditionalPredicate(); - virtual void setAdditionalPredicate( const Pointer& additionalPredicate ); + virtual void setAdditionalPredicate(const Pointer& additionalPredicate); virtual bool isNetworkSubscription() const; - virtual void setNetworkSubscription( bool networkSubscription ); + virtual void setNetworkSubscription(bool networkSubscription); virtual bool isOptimizedAcknowledge() const; - virtual void setOptimizedAcknowledge( bool optimizedAcknowledge ); + virtual void setOptimizedAcknowledge(bool optimizedAcknowledge); virtual bool isNoRangeAcks() const; - virtual void setNoRangeAcks( bool noRangeAcks ); + virtual void setNoRangeAcks(bool noRangeAcks); virtual const std::vector< decaf::lang::Pointer >& getNetworkConsumerPath() const; virtual std::vector< decaf::lang::Pointer >& getNetworkConsumerPath(); - virtual void setNetworkConsumerPath( const std::vector< decaf::lang::Pointer >& networkConsumerPath ); + virtual void setNetworkConsumerPath(const std::vector< decaf::lang::Pointer >& networkConsumerPath); /** * @return an answer of true to the isConsumerInfo() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ControlCommand.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ControlCommand.h b/activemq-cpp/src/main/activemq/commands/ControlCommand.h index a28f1aa..c26f104 100644 --- a/activemq-cpp/src/main/activemq/commands/ControlCommand.h +++ b/activemq-cpp/src/main/activemq/commands/ControlCommand.h @@ -75,7 +75,7 @@ namespace commands { virtual const std::string& getCommand() const; virtual std::string& getCommand(); - virtual void setCommand( const std::string& command ); + virtual void setCommand(const std::string& command); /** * @return an answer of true to the isControlCommand() query. http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp b/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp index f4ebe03..fde6055 100644 --- a/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp +++ b/activemq-cpp/src/main/activemq/commands/DataArrayResponse.cpp @@ -124,7 +124,7 @@ bool DataArrayResponse::equals(const DataStructure* value) const { for (size_t idata = 0; idata < this->getData().size(); ++idata) { if (this->getData()[idata] != NULL ) { - if (!this->getData()[idata]->equals( valuePtr->getData()[idata].get())) { + if (!this->getData()[idata]->equals(valuePtr->getData()[idata].get())) { return false; } } else if (valuePtr->getData()[idata] != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h b/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h index 9ba6ab6..810ea1c 100644 --- a/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h +++ b/activemq-cpp/src/main/activemq/commands/DataArrayResponse.h @@ -76,7 +76,7 @@ namespace commands { virtual const std::vector< decaf::lang::Pointer >& getData() const; virtual std::vector< decaf::lang::Pointer >& getData(); - virtual void setData( const std::vector< decaf::lang::Pointer >& data ); + virtual void setData(const std::vector< decaf::lang::Pointer >& data); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DataResponse.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DataResponse.cpp b/activemq-cpp/src/main/activemq/commands/DataResponse.cpp index c7197b8..4f2ef80 100644 --- a/activemq-cpp/src/main/activemq/commands/DataResponse.cpp +++ b/activemq-cpp/src/main/activemq/commands/DataResponse.cpp @@ -115,7 +115,7 @@ bool DataResponse::equals(const DataStructure* value) const { } if (this->getData() != NULL) { - if (!this->getData()->equals( valuePtr->getData().get())) { + if (!this->getData()->equals(valuePtr->getData().get())) { return false; } } else if (valuePtr->getData() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DataResponse.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DataResponse.h b/activemq-cpp/src/main/activemq/commands/DataResponse.h index 04bbc8e..45123fa 100644 --- a/activemq-cpp/src/main/activemq/commands/DataResponse.h +++ b/activemq-cpp/src/main/activemq/commands/DataResponse.h @@ -76,7 +76,7 @@ namespace commands { virtual const Pointer& getData() const; virtual Pointer& getData(); - virtual void setData( const Pointer& data ); + virtual void setData(const Pointer& data); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp b/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp index 6618735..365d41c 100644 --- a/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp +++ b/activemq-cpp/src/main/activemq/commands/DestinationInfo.cpp @@ -148,14 +148,14 @@ bool DestinationInfo::equals(const DataStructure* value) const { } if (this->getConnectionId() != NULL) { - if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) { + if (!this->getConnectionId()->equals(valuePtr->getConnectionId().get())) { return false; } } else if (valuePtr->getConnectionId() != NULL) { return false; } if (this->getDestination() != NULL) { - if (!this->getDestination()->equals( valuePtr->getDestination().get())) { + if (!this->getDestination()->equals(valuePtr->getDestination().get())) { return false; } } else if (valuePtr->getDestination() != NULL) { @@ -169,7 +169,7 @@ bool DestinationInfo::equals(const DataStructure* value) const { } for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) { if (this->getBrokerPath()[ibrokerPath] != NULL ) { - if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) { + if (!this->getBrokerPath()[ibrokerPath]->equals(valuePtr->getBrokerPath()[ibrokerPath].get())) { return false; } } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DestinationInfo.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DestinationInfo.h b/activemq-cpp/src/main/activemq/commands/DestinationInfo.h index 6734359..54aa528 100644 --- a/activemq-cpp/src/main/activemq/commands/DestinationInfo.h +++ b/activemq-cpp/src/main/activemq/commands/DestinationInfo.h @@ -82,21 +82,21 @@ namespace commands { virtual const Pointer& getConnectionId() const; virtual Pointer& getConnectionId(); - virtual void setConnectionId( const Pointer& connectionId ); + virtual void setConnectionId(const Pointer& connectionId); virtual const Pointer& getDestination() const; virtual Pointer& getDestination(); - virtual void setDestination( const Pointer& destination ); + virtual void setDestination(const Pointer& destination); virtual unsigned char getOperationType() const; - virtual void setOperationType( unsigned char operationType ); + virtual void setOperationType(unsigned char operationType); virtual long long getTimeout() const; - virtual void setTimeout( long long timeout ); + virtual void setTimeout(long long timeout); virtual const std::vector< decaf::lang::Pointer >& getBrokerPath() const; virtual std::vector< decaf::lang::Pointer >& getBrokerPath(); - virtual void setBrokerPath( const std::vector< decaf::lang::Pointer >& brokerPath ); + virtual void setBrokerPath(const std::vector< decaf::lang::Pointer >& brokerPath); virtual Pointer visit(activemq::state::CommandVisitor* visitor); http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.h b/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.h index 0583e59..69e924f 100644 --- a/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.h +++ b/activemq-cpp/src/main/activemq/commands/DiscoveryEvent.h @@ -76,11 +76,11 @@ namespace commands { virtual const std::string& getServiceName() const; virtual std::string& getServiceName(); - virtual void setServiceName( const std::string& serviceName ); + virtual void setServiceName(const std::string& serviceName); virtual const std::string& getBrokerName() const; virtual std::string& getBrokerName(); - virtual void setBrokerName( const std::string& brokerName ); + virtual void setBrokerName(const std::string& brokerName); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp b/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp index 6d02608..3222be5 100644 --- a/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp +++ b/activemq-cpp/src/main/activemq/commands/ExceptionResponse.cpp @@ -115,7 +115,7 @@ bool ExceptionResponse::equals(const DataStructure* value) const { } if (this->getException() != NULL) { - if (!this->getException()->equals( valuePtr->getException().get())) { + if (!this->getException()->equals(valuePtr->getException().get())) { return false; } } else if (valuePtr->getException() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/ExceptionResponse.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/ExceptionResponse.h b/activemq-cpp/src/main/activemq/commands/ExceptionResponse.h index cef9531..911b0bf 100644 --- a/activemq-cpp/src/main/activemq/commands/ExceptionResponse.h +++ b/activemq-cpp/src/main/activemq/commands/ExceptionResponse.h @@ -76,7 +76,7 @@ namespace commands { virtual const Pointer& getException() const; virtual Pointer& getException(); - virtual void setException( const Pointer& exception ); + virtual void setException(const Pointer& exception); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/IntegerResponse.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/IntegerResponse.h b/activemq-cpp/src/main/activemq/commands/IntegerResponse.h index 5048259..f7cdbe8 100644 --- a/activemq-cpp/src/main/activemq/commands/IntegerResponse.h +++ b/activemq-cpp/src/main/activemq/commands/IntegerResponse.h @@ -74,7 +74,7 @@ namespace commands { virtual bool equals(const DataStructure* value) const; virtual int getResult() const; - virtual void setResult( int result ); + virtual void setResult(int result); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp b/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp index c137896..6c81504 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp +++ b/activemq-cpp/src/main/activemq/commands/JournalQueueAck.cpp @@ -123,14 +123,14 @@ bool JournalQueueAck::equals(const DataStructure* value) const { } if (this->getDestination() != NULL) { - if (!this->getDestination()->equals( valuePtr->getDestination().get())) { + if (!this->getDestination()->equals(valuePtr->getDestination().get())) { return false; } } else if (valuePtr->getDestination() != NULL) { return false; } if (this->getMessageAck() != NULL) { - if (!this->getMessageAck()->equals( valuePtr->getMessageAck().get())) { + if (!this->getMessageAck()->equals(valuePtr->getMessageAck().get())) { return false; } } else if (valuePtr->getMessageAck() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalQueueAck.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalQueueAck.h b/activemq-cpp/src/main/activemq/commands/JournalQueueAck.h index 57f49d6..1320328 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalQueueAck.h +++ b/activemq-cpp/src/main/activemq/commands/JournalQueueAck.h @@ -78,11 +78,11 @@ namespace commands { virtual const Pointer& getDestination() const; virtual Pointer& getDestination(); - virtual void setDestination( const Pointer& destination ); + virtual void setDestination(const Pointer& destination); virtual const Pointer& getMessageAck() const; virtual Pointer& getMessageAck(); - virtual void setMessageAck( const Pointer& messageAck ); + virtual void setMessageAck(const Pointer& messageAck); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp b/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp index 154626c..f20c19a 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp +++ b/activemq-cpp/src/main/activemq/commands/JournalTopicAck.cpp @@ -140,14 +140,14 @@ bool JournalTopicAck::equals(const DataStructure* value) const { } if (this->getDestination() != NULL) { - if (!this->getDestination()->equals( valuePtr->getDestination().get())) { + if (!this->getDestination()->equals(valuePtr->getDestination().get())) { return false; } } else if (valuePtr->getDestination() != NULL) { return false; } if (this->getMessageId() != NULL) { - if (!this->getMessageId()->equals( valuePtr->getMessageId().get())) { + if (!this->getMessageId()->equals(valuePtr->getMessageId().get())) { return false; } } else if (valuePtr->getMessageId() != NULL) { @@ -163,7 +163,7 @@ bool JournalTopicAck::equals(const DataStructure* value) const { return false; } if (this->getTransactionId() != NULL) { - if (!this->getTransactionId()->equals( valuePtr->getTransactionId().get())) { + if (!this->getTransactionId()->equals(valuePtr->getTransactionId().get())) { return false; } } else if (valuePtr->getTransactionId() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalTopicAck.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalTopicAck.h b/activemq-cpp/src/main/activemq/commands/JournalTopicAck.h index 7b7f190..8acd333 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalTopicAck.h +++ b/activemq-cpp/src/main/activemq/commands/JournalTopicAck.h @@ -83,26 +83,26 @@ namespace commands { virtual const Pointer& getDestination() const; virtual Pointer& getDestination(); - virtual void setDestination( const Pointer& destination ); + virtual void setDestination(const Pointer& destination); virtual const Pointer& getMessageId() const; virtual Pointer& getMessageId(); - virtual void setMessageId( const Pointer& messageId ); + virtual void setMessageId(const Pointer& messageId); virtual long long getMessageSequenceId() const; - virtual void setMessageSequenceId( long long messageSequenceId ); + virtual void setMessageSequenceId(long long messageSequenceId); virtual const std::string& getSubscritionName() const; virtual std::string& getSubscritionName(); - virtual void setSubscritionName( const std::string& subscritionName ); + virtual void setSubscritionName(const std::string& subscritionName); virtual const std::string& getClientId() const; virtual std::string& getClientId(); - virtual void setClientId( const std::string& clientId ); + virtual void setClientId(const std::string& clientId); virtual const Pointer& getTransactionId() const; virtual Pointer& getTransactionId(); - virtual void setTransactionId( const Pointer& transactionId ); + virtual void setTransactionId(const Pointer& transactionId); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalTrace.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalTrace.h b/activemq-cpp/src/main/activemq/commands/JournalTrace.h index 539fd1f..25fbc9e 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalTrace.h +++ b/activemq-cpp/src/main/activemq/commands/JournalTrace.h @@ -75,7 +75,7 @@ namespace commands { virtual const std::string& getMessage() const; virtual std::string& getMessage(); - virtual void setMessage( const std::string& message ); + virtual void setMessage(const std::string& message); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp b/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp index eb22d48..6abb6c8 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp +++ b/activemq-cpp/src/main/activemq/commands/JournalTransaction.cpp @@ -121,7 +121,7 @@ bool JournalTransaction::equals(const DataStructure* value) const { } if (this->getTransactionId() != NULL) { - if (!this->getTransactionId()->equals( valuePtr->getTransactionId().get())) { + if (!this->getTransactionId()->equals(valuePtr->getTransactionId().get())) { return false; } } else if (valuePtr->getTransactionId() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/JournalTransaction.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/JournalTransaction.h b/activemq-cpp/src/main/activemq/commands/JournalTransaction.h index a3e8560..d4f3e91 100644 --- a/activemq-cpp/src/main/activemq/commands/JournalTransaction.h +++ b/activemq-cpp/src/main/activemq/commands/JournalTransaction.h @@ -78,13 +78,13 @@ namespace commands { virtual const Pointer& getTransactionId() const; virtual Pointer& getTransactionId(); - virtual void setTransactionId( const Pointer& transactionId ); + virtual void setTransactionId(const Pointer& transactionId); virtual unsigned char getType() const; - virtual void setType( unsigned char type ); + virtual void setType(unsigned char type); virtual bool getWasPrepared() const; - virtual void setWasPrepared( bool wasPrepared ); + virtual void setWasPrepared(bool wasPrepared); }; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp b/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp index 0f21fc3..cceb20e 100644 --- a/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp +++ b/activemq-cpp/src/main/activemq/commands/LocalTransactionId.cpp @@ -124,7 +124,7 @@ bool LocalTransactionId::equals(const DataStructure* value) const { return false; } if (this->getConnectionId() != NULL) { - if (!this->getConnectionId()->equals( valuePtr->getConnectionId().get())) { + if (!this->getConnectionId()->equals(valuePtr->getConnectionId().get())) { return false; } } else if (valuePtr->getConnectionId() != NULL) { http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/LocalTransactionId.h ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/LocalTransactionId.h b/activemq-cpp/src/main/activemq/commands/LocalTransactionId.h index 80243b6..93d3da7 100644 --- a/activemq-cpp/src/main/activemq/commands/LocalTransactionId.h +++ b/activemq-cpp/src/main/activemq/commands/LocalTransactionId.h @@ -48,6 +48,13 @@ namespace commands { class AMQCPP_API LocalTransactionId : public TransactionId, public decaf::lang::Comparable { protected: + using TransactionId::compareTo; + using TransactionId::equals; + using TransactionId::operator <; + using TransactionId::operator==; + + protected: + long long value; Pointer connectionId; @@ -80,11 +87,11 @@ namespace commands { } virtual long long getValue() const; - virtual void setValue( long long value ); + virtual void setValue(long long value); virtual const Pointer& getConnectionId() const; virtual Pointer& getConnectionId(); - virtual void setConnectionId( const Pointer& connectionId ); + virtual void setConnectionId(const Pointer& connectionId); virtual int compareTo(const LocalTransactionId& value) const; http://git-wip-us.apache.org/repos/asf/activemq-cpp/blob/4cbb7aac/activemq-cpp/src/main/activemq/commands/Message.cpp ---------------------------------------------------------------------- diff --git a/activemq-cpp/src/main/activemq/commands/Message.cpp b/activemq-cpp/src/main/activemq/commands/Message.cpp index dcd40c1..cd73061 100644 --- a/activemq-cpp/src/main/activemq/commands/Message.cpp +++ b/activemq-cpp/src/main/activemq/commands/Message.cpp @@ -295,42 +295,42 @@ bool Message::equals(const DataStructure* value) const { } if (this->getProducerId() != NULL) { - if (!this->getProducerId()->equals( valuePtr->getProducerId().get())) { + if (!this->getProducerId()->equals(valuePtr->getProducerId().get())) { return false; } } else if (valuePtr->getProducerId() != NULL) { return false; } if (this->getDestination() != NULL) { - if (!this->getDestination()->equals( valuePtr->getDestination().get())) { + if (!this->getDestination()->equals(valuePtr->getDestination().get())) { return false; } } else if (valuePtr->getDestination() != NULL) { return false; } if (this->getTransactionId() != NULL) { - if (!this->getTransactionId()->equals( valuePtr->getTransactionId().get())) { + if (!this->getTransactionId()->equals(valuePtr->getTransactionId().get())) { return false; } } else if (valuePtr->getTransactionId() != NULL) { return false; } if (this->getOriginalDestination() != NULL) { - if (!this->getOriginalDestination()->equals( valuePtr->getOriginalDestination().get())) { + if (!this->getOriginalDestination()->equals(valuePtr->getOriginalDestination().get())) { return false; } } else if (valuePtr->getOriginalDestination() != NULL) { return false; } if (this->getMessageId() != NULL) { - if (!this->getMessageId()->equals( valuePtr->getMessageId().get())) { + if (!this->getMessageId()->equals(valuePtr->getMessageId().get())) { return false; } } else if (valuePtr->getMessageId() != NULL) { return false; } if (this->getOriginalTransactionId() != NULL) { - if (!this->getOriginalTransactionId()->equals( valuePtr->getOriginalTransactionId().get())) { + if (!this->getOriginalTransactionId()->equals(valuePtr->getOriginalTransactionId().get())) { return false; } } else if (valuePtr->getOriginalTransactionId() != NULL) { @@ -355,7 +355,7 @@ bool Message::equals(const DataStructure* value) const { return false; } if (this->getReplyTo() != NULL) { - if (!this->getReplyTo()->equals( valuePtr->getReplyTo().get())) { + if (!this->getReplyTo()->equals(valuePtr->getReplyTo().get())) { return false; } } else if (valuePtr->getReplyTo() != NULL) { @@ -378,14 +378,14 @@ bool Message::equals(const DataStructure* value) const { } } if (this->getDataStructure() != NULL) { - if (!this->getDataStructure()->equals( valuePtr->getDataStructure().get())) { + if (!this->getDataStructure()->equals(valuePtr->getDataStructure().get())) { return false; } } else if (valuePtr->getDataStructure() != NULL) { return false; } if (this->getTargetConsumerId() != NULL) { - if (!this->getTargetConsumerId()->equals( valuePtr->getTargetConsumerId().get())) { + if (!this->getTargetConsumerId()->equals(valuePtr->getTargetConsumerId().get())) { return false; } } else if (valuePtr->getTargetConsumerId() != NULL) { @@ -399,7 +399,7 @@ bool Message::equals(const DataStructure* value) const { } for (size_t ibrokerPath = 0; ibrokerPath < this->getBrokerPath().size(); ++ibrokerPath) { if (this->getBrokerPath()[ibrokerPath] != NULL ) { - if (!this->getBrokerPath()[ibrokerPath]->equals( valuePtr->getBrokerPath()[ibrokerPath].get())) { + if (!this->getBrokerPath()[ibrokerPath]->equals(valuePtr->getBrokerPath()[ibrokerPath].get())) { return false; } } else if (valuePtr->getBrokerPath()[ibrokerPath] != NULL) { @@ -420,7 +420,7 @@ bool Message::equals(const DataStructure* value) const { } for (size_t icluster = 0; icluster < this->getCluster().size(); ++icluster) { if (this->getCluster()[icluster] != NULL ) { - if (!this->getCluster()[icluster]->equals( valuePtr->getCluster()[icluster].get())) { + if (!this->getCluster()[icluster]->equals(valuePtr->getCluster()[icluster].get())) { return false; } } else if (valuePtr->getCluster()[icluster] != NULL) {