qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject svn commit: r890683 - in /qpid/trunk/qpid/cpp: examples/messaging/CMakeLists.txt include/qpid/sys/ExceptionHolder.h src/Makefile.am src/qpid/sys/ExceptionHolder.h
Date Tue, 15 Dec 2009 08:23:20 GMT
Author: gsim
Date: Tue Dec 15 08:23:19 2009
New Revision: 890683

URL: http://svn.apache.org/viewvc?rev=890683&view=rev
Log:
QPID-2212: revert previous attempt at fix; disable on windows only

Added:
    qpid/trunk/qpid/cpp/include/qpid/sys/ExceptionHolder.h
      - copied, changed from r890218, qpid/trunk/qpid/cpp/src/qpid/sys/ExceptionHolder.h
Removed:
    qpid/trunk/qpid/cpp/src/qpid/sys/ExceptionHolder.h
Modified:
    qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
    qpid/trunk/qpid/cpp/src/Makefile.am

Modified: qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt?rev=890683&r1=890682&r2=890683&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/CMakeLists.txt Tue Dec 15 08:23:19 2009
@@ -17,10 +17,12 @@
 # under the License.
 #
 
-# disabling spout & drain under cmake until build issues on windows
-# are resolved (QPID-2212):
-#add_example(messaging drain ${Boost_PROGRAM_OPTIONS_LIBRARY})
-#add_example(messaging spout ${Boost_PROGRAM_OPTIONS_LIBRARY})
+# disabling spout & drain on windows until build issues are resolved
+# (QPID-2212): 
+if (NOT MSVC)
+  add_example(messaging drain)
+  add_example(messaging spout)
+endif (NOT MSVC)
 
 add_example(messaging queue_receiver)
 add_example(messaging queue_sender)

Copied: qpid/trunk/qpid/cpp/include/qpid/sys/ExceptionHolder.h (from r890218, qpid/trunk/qpid/cpp/src/qpid/sys/ExceptionHolder.h)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/sys/ExceptionHolder.h?p2=qpid/trunk/qpid/cpp/include/qpid/sys/ExceptionHolder.h&p1=qpid/trunk/qpid/cpp/src/qpid/sys/ExceptionHolder.h&r1=890218&r2=890683&rev=890683&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ExceptionHolder.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/sys/ExceptionHolder.h Tue Dec 15 08:23:19 2009
@@ -22,7 +22,6 @@
  *
  */
 
-#include "qpid/memory.h"
 #include <boost/shared_ptr.hpp>
 
 

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=890683&r1=890682&r2=890683&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Tue Dec 15 08:23:19 2009
@@ -444,7 +444,6 @@
   qpid/sys/DispatchHandle.h			\
   qpid/sys/Dispatcher.cpp			\
   qpid/sys/Dispatcher.h				\
-  qpid/sys/ExceptionHolder.h			\
   qpid/sys/FileSysDir.h				\
   qpid/sys/Fork.h				\
   qpid/sys/LockFile.h				\
@@ -791,6 +790,7 @@
   ../include/qpid/management/ManagementEvent.h	\
   ../include/qpid/management/ManagementObject.h	\
   ../include/qpid/sys/Condition.h		\
+  ../include/qpid/sys/ExceptionHolder.h		\
   ../include/qpid/sys/IOHandle.h		\
   ../include/qpid/sys/IntegerTypes.h		\
   ../include/qpid/sys/Monitor.h			\



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message