Revisit fix for QPID-1737: (clash with Win32 symbol)

  Change all use of STATUS_INVALID_PARAMETER to STATUS_PARAMETER_INVALID


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@810227 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 7 insertions, 9 deletions

diff --git a/cpp/include/qpid/management/Manageable.h b/cpp/include/qpid/management/Manageable.h
index 8062479ac6..7a72cc1592 100644
--- a/cpp/include/qpid/management/Manageable.h
+++ b/cpp/include/qpid/management/Manageable.h
@@ -43,7 +43,7 @@ class QPID_COMMON_EXTERN Manageable
     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;
diff --git a/cpp/include/qpid/sys/windows/Condition.h b/cpp/include/qpid/sys/windows/Condition.h
index c31f7b4823..979fae9b0a 100755
--- a/cpp/include/qpid/sys/windows/Condition.h
+++ b/cpp/include/qpid/sys/windows/Condition.h
@@ -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 {
diff --git a/cpp/include/qpid/sys/windows/Mutex.h b/cpp/include/qpid/sys/windows/Mutex.h
index 12768640d5..5dcc69e836 100755
--- a/cpp/include/qpid/sys/windows/Mutex.h
+++ b/cpp/include/qpid/sys/windows/Mutex.h
@@ -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 {
diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp
index 4a6590fb5f..093e9cea32 100644
--- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp
+++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp
@@ -435,8 +435,8 @@ void ManagementAgentImpl::invokeMethodRequest(Buffer& inBuffer, uint32_t sequenc
     } 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 {
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 8b6cb5e049..13cf88fb11 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -386,7 +386,7 @@ Manageable::status_t Broker::ManagementMethod (uint32_t methodId,
 	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:
diff --git a/cpp/src/qpid/management/Manageable.cpp b/cpp/src/qpid/management/Manageable.cpp
index e487dfc455..a3593e73e3 100644
--- a/cpp/src/qpid/management/Manageable.cpp
+++ b/cpp/src/qpid/management/Manageable.cpp
@@ -33,7 +33,7 @@ string Manageable::StatusText (status_t status, string text)
     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";
     }
diff --git a/cpp/src/qpid/management/ManagementAgent.cpp b/cpp/src/qpid/management/ManagementAgent.cpp
index 2df10b1e95..0e462342d4 100644
--- a/cpp/src/qpid/management/ManagementAgent.cpp
+++ b/cpp/src/qpid/management/ManagementAgent.cpp
@@ -535,8 +535,8 @@ void ManagementAgent::handleMethodRequestLH (Buffer& inBuffer, string replyToKey
     } 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 {