Author: astitcher Date: Tue May 5 22:13:18 2009 New Revision: 771989 URL: http://svn.apache.org/viewvc?rev=771989&view=rev Log: Hack around the namespace pollution in QPID-1737 Hack around simultaneous import and definition of ManagementAgent::Singleton in qpidbroker Make ACL plugin optional (default off on Windows currently)
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt qpid/trunk/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=771989&r1=771988&r2=771989&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original) +++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue May 5 22:13:18 2009 @@ -228,20 +228,28 @@ endif (BUILD_XML) # Build the ACL plugin -set (acl_SOURCES - qpid/acl/Acl.cpp - qpid/acl/Acl.h - qpid/acl/AclData.cpp - qpid/acl/AclData.h - qpid/acl/AclPlugin.cpp - qpid/acl/AclReader.cpp - qpid/acl/AclReader.h - ) +set (acl_default ON) +# Like this until we fix exporting symbols from the generated management code +if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) + set(acl_default OFF) +endif (NOT CMAKE_SYSTEM_NAME STREQUAL Windows) +option(BUILD_ACL "Build ACL enforcement broker plugin" ${acl_default}) +if (BUILD_ACL) + set (acl_SOURCES + qpid/acl/Acl.cpp + qpid/acl/Acl.h + qpid/acl/AclData.cpp + qpid/acl/AclData.h + qpid/acl/AclPlugin.cpp + qpid/acl/AclReader.cpp + qpid/acl/AclReader.h + ) add_library (acl MODULE ${acl_SOURCES}) target_link_libraries (acl qpidbroker) set_target_properties (acl PROPERTIES PREFIX "" LINK_FLAGS -Wl,--no-undefined) +endif (BUILD_ACL) # Check for optional cluster support requirements include (cluster.cmake) Modified: qpid/trunk/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h?rev=771989&r1=771988&r2=771989&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/agent/QmfAgentImportExport.h Tue May 5 22:13:18 2009 @@ -20,7 +20,7 @@ * under the License. */ -#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) +#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) && !defined(qpidbroker_EXPORTS) #if defined(QMF_AGENT_EXPORT) || defined (qmfagent_EXPORTS) #define QMF_AGENT_EXTERN __declspec(dllexport) #else Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h?rev=771989&r1=771988&r2=771989&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Condition.h Tue May 5 22:13:18 2009 @@ -30,6 +30,7 @@ #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/src/qpid/sys/windows/Mutex.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h?rev=771989&r1=771988&r2=771989&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Mutex.h Tue May 5 22:13:18 2009 @@ -31,6 +31,7 @@ #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/sys/windows/uuid.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp?rev=771989&r1=771988&r2=771989&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp Tue May 5 22:13:18 2009 @@ -19,6 +19,11 @@ * */ +#include <Rpc.h> +#ifdef uuid_t /* Done in rpcdce.h */ +# undef uuid_t +#endif + #include "uuid.h" #include <string.h> Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h?rev=771989&r1=771988&r2=771989&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h Tue May 5 22:13:18 2009 @@ -22,13 +22,9 @@ * */ -#include <Rpc.h> #include "qpid/CommonImportExport.h" - -#ifdef uuid_t /* Done in rpcdce.h */ -# undef uuid_t -#endif #include <qpid/sys/IntegerTypes.h> + namespace qpid { namespace sys { const size_t UuidSize = 16; }} typedef uint8_t uuid_t[qpid::sys::UuidSize]; --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org