Steve,
Is there another way to solve this problem? This commit breaks the
build. But worse, that definition is part of an API that is used by
clients outside of Apache. This change will break the builds of Qpid users.
-Ted
[email protected] wrote:
Author: shuston
Date: Wed Mar 25 17:25:55 2009
New Revision: 758356
URL: http://svn.apache.org/viewvc?rev=758356&view=rev
Log:
Apply patch to s/STATUS_INVALID_PARAMETER/STATUS_PARAMETER_INVALID/ to build on
Win7SDK; fixes QPID-1737
Modified:
qpid/branches/0.5-release/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.cpp
qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.h
qpid/branches/0.5-release/qpid/cpp/src/qpid/management/ManagementBroker.cpp
Modified: qpid/branches/0.5-release/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/cpp/src/qpid/broker/Broker.cpp?rev=758356&r1=758355&r2=758356&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/branches/0.5-release/qpid/cpp/src/qpid/broker/Broker.cpp Wed Mar 25
17:25:55 2009
@@ -386,7 +386,7 @@
if (queueMoveMessages(moveArgs.i_srcQueue, moveArgs.i_destQueue,
moveArgs.i_qty))
status = Manageable::STATUS_OK;
else
- return Manageable::STATUS_INVALID_PARAMETER;
+ return Manageable::STATUS_PARAMETER_INVALID;
break;
}
default:
Modified: qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.cpp?rev=758356&r1=758355&r2=758356&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.cpp
(original)
+++ qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.cpp Wed
Mar 25 17:25:55 2009
@@ -33,7 +33,7 @@
case STATUS_UNKNOWN_OBJECT : return "UnknownObject";
case STATUS_UNKNOWN_METHOD : return "UnknownMethod";
case STATUS_NOT_IMPLEMENTED : return "NotImplemented";
- case STATUS_INVALID_PARAMETER : return "InvalidParameter";
+ case STATUS_PARAMETER_INVALID : return "InvalidParameter";
case STATUS_FEATURE_NOT_IMPLEMENTED : return "FeatureNotImplemented";
case STATUS_FORBIDDEN : return "Forbidden";
}
Modified: qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.h
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.h?rev=758356&r1=758355&r2=758356&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.h
(original)
+++ qpid/branches/0.5-release/qpid/cpp/src/qpid/management/Manageable.h Wed Mar
25 17:25:55 2009
@@ -43,7 +43,7 @@
static const status_t STATUS_UNKNOWN_OBJECT = 1;
static const status_t STATUS_UNKNOWN_METHOD = 2;
static const status_t STATUS_NOT_IMPLEMENTED = 3;
- static const status_t STATUS_INVALID_PARAMETER = 4;
+ static const status_t STATUS_PARAMETER_INVALID = 4;
static const status_t STATUS_FEATURE_NOT_IMPLEMENTED = 5;
static const status_t STATUS_FORBIDDEN = 6;
static const status_t STATUS_EXCEPTION = 7;
Modified:
qpid/branches/0.5-release/qpid/cpp/src/qpid/management/ManagementBroker.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.5-release/qpid/cpp/src/qpid/management/ManagementBroker.cpp?rev=758356&r1=758355&r2=758356&view=diff
==============================================================================
--- qpid/branches/0.5-release/qpid/cpp/src/qpid/management/ManagementBroker.cpp
(original)
+++ qpid/branches/0.5-release/qpid/cpp/src/qpid/management/ManagementBroker.cpp
Wed Mar 25 17:25:55 2009
@@ -512,8 +512,8 @@
} else {
if ((iter->second->getPackageName() != packageName) ||
(iter->second->getClassName() != className)) {
- outBuffer.putLong (Manageable::STATUS_INVALID_PARAMETER);
- outBuffer.putMediumString(Manageable::StatusText
(Manageable::STATUS_INVALID_PARAMETER));
+ outBuffer.putLong (Manageable::STATUS_PARAMETER_INVALID);
+ outBuffer.putMediumString(Manageable::StatusText
(Manageable::STATUS_PARAMETER_INVALID));
}
else
try {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
