diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2009-09-01 20:47:15 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2009-09-01 20:47:15 +0000 |
| commit | 26022334bbaff31fa50242c68b38276aa9e0ffde (patch) | |
| tree | 08f2fcae1b10134c2267da1ed9cf90d6c6bbfaae /qpid/cpp/include | |
| parent | 943264c4e9efe0865b85dcced05a8348e8d972e2 (diff) | |
| download | qpid-python-26022334bbaff31fa50242c68b38276aa9e0ffde.tar.gz | |
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@810227 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/include')
| -rw-r--r-- | qpid/cpp/include/qpid/management/Manageable.h | 2 | ||||
| -rwxr-xr-x | qpid/cpp/include/qpid/sys/windows/Condition.h | 1 | ||||
| -rwxr-xr-x | qpid/cpp/include/qpid/sys/windows/Mutex.h | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/qpid/cpp/include/qpid/management/Manageable.h b/qpid/cpp/include/qpid/management/Manageable.h index 8062479ac6..7a72cc1592 100644 --- a/qpid/cpp/include/qpid/management/Manageable.h +++ b/qpid/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/qpid/cpp/include/qpid/sys/windows/Condition.h b/qpid/cpp/include/qpid/sys/windows/Condition.h index c31f7b4823..979fae9b0a 100755 --- a/qpid/cpp/include/qpid/sys/windows/Condition.h +++ b/qpid/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/qpid/cpp/include/qpid/sys/windows/Mutex.h b/qpid/cpp/include/qpid/sys/windows/Mutex.h index 12768640d5..5dcc69e836 100755 --- a/qpid/cpp/include/qpid/sys/windows/Mutex.h +++ b/qpid/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 { |