Author: astitcher
Date: Tue Sep 1 20:47:15 2009
New Revision: 810227
URL: http://svn.apache.org/viewvc?rev=810227&view=rev
Log:
Revisit fix for QPID-1737: (clash with Win32 symbol)
Change all use of STATUS_INVALID_PARAMETER to STATUS_PARAMETER_INVALID
Modified:
qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h
qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h
qpid/trunk/qpid/cpp/include/qpid/sys/windows/Mutex.h
qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp
qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
Modified: qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/management/Manageable.h Tue Sep 1
20:47:15 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/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/windows/Condition.h Tue Sep 1
20:47:15 2009
@@ -30,7 +30,6 @@
#include <boost/thread/condition.hpp>
#include <boost/thread/thread_time.hpp>
#include <windows.h>
-#undef STATUS_INVALID_PARAMETER // Hack for windows.h namespace pollution
namespace qpid {
namespace sys {
Modified: qpid/trunk/qpid/cpp/include/qpid/sys/windows/Mutex.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/windows/Mutex.h?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/sys/windows/Mutex.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/windows/Mutex.h Tue Sep 1 20:47:15
2009
@@ -31,7 +31,6 @@
#include <boost/thread/shared_mutex.hpp>
#include <boost/thread/thread_time.hpp>
#include <boost/thread/tss.hpp>
-#undef STATUS_INVALID_PARAMETER // Hack for windows.h namespace pollution
namespace qpid {
namespace sys {
Modified: qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/agent/ManagementAgentImpl.cpp Tue Sep 1
20:47:15 2009
@@ -435,8 +435,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 {
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.cpp Tue Sep 1 20:47:15 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/trunk/qpid/cpp/src/qpid/management/Manageable.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/Manageable.cpp Tue Sep 1 20:47:15
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/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp?rev=810227&r1=810226&r2=810227&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementAgent.cpp Tue Sep 1
20:47:15 2009
@@ -535,8 +535,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:commits-subscr...@qpid.apache.org
