Author: aconway
Date: Fri Nov 3 13:06:51 2006
New Revision: 470994
URL: http://svn.apache.org/viewvc?view=rev&rev=470994
Log:
2006-11-03 Jim Meyering <[EMAIL PROTECTED]>
* qpid/cpp/Makefile ($(TESTDIR)/%Test.so): Depend on
$(LIB_common) and $(LIB_client), just as is done for the
$(TESTDIR)/% rule.
Modified:
incubator/qpid/trunk/qpid/cpp/Makefile
incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/APRPool.cpp
incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/Acceptor.h
Modified: incubator/qpid/trunk/qpid/cpp/Makefile
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/Makefile?view=diff&rev=470994&r1=470993&r2=470994
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/Makefile (original)
+++ incubator/qpid/trunk/qpid/cpp/Makefile Fri Nov 3 13:06:51 2006
@@ -100,7 +100,7 @@
$(foreach dir,$(SRCDIRS),$(eval $(call CPPRULE,$(dir))))
# Unit test plugin libraries.
-$(TESTDIR)/%Test.so: test/unit/%Test.cpp
+$(TESTDIR)/%Test.so: test/unit/%Test.cpp $(LIB_common) $(LIB_client)
mkdir -p $(dir $@)
$(CXX) -shared -o $@ $< $(CXXFLAGS) -Itest/include $(LDFLAGS)
-lcppunit $(LIB_common) $(LIB_broker)
Modified: incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/APRPool.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/APRPool.cpp?view=diff&rev=470994&r1=470993&r2=470994
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/APRPool.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/APRPool.cpp Fri Nov 3
13:06:51 2006
@@ -18,7 +18,7 @@
#include "APRPool.h"
#include "qpid/concurrent/APRBase.h"
-#include <boost/pool/singleton_pool.hpp>
+#include <boost/pool/detail/singleton.hpp>
using namespace qpid::io;
using namespace qpid::concurrent;
Modified: incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/Acceptor.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/Acceptor.h?view=diff&rev=470994&r1=470993&r2=470994
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/Acceptor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src_apr/qpid/io/Acceptor.h Fri Nov 3
13:06:51 2006
@@ -24,7 +24,6 @@
#include "qpid/io/Acceptor.h"
#include "qpid/concurrent/Monitor.h"
-#include "qpid/concurrent/ThreadFactory.h"
#include "qpid/io/LFProcessor.h"
#include "qpid/io/LFSessionContext.h"
#include "qpid/concurrent/Runnable.h"