Revision: 4468
http://playerstage.svn.sourceforge.net/playerstage/?rev=4468&view=rev
Author: gerkey
Date: 2008-04-01 15:53:29 -0700 (Tue, 01 Apr 2008)
Log Message:
-----------
added check for boost::bind to boost::thread test
Modified Paths:
--------------
code/player/trunk/acinclude.m4
code/player/trunk/client_libs/libplayerc++/playerc++.h
code/player/trunk/client_libs/libplayerc++/playerclient.h
Modified: code/player/trunk/acinclude.m4
===================================================================
--- code/player/trunk/acinclude.m4 2008-04-01 22:52:39 UTC (rev 4467)
+++ code/player/trunk/acinclude.m4 2008-04-01 22:53:29 UTC (rev 4468)
@@ -540,8 +540,9 @@
CXXFLAGS_SAVE=$CXXFLAGS
AC_LANG_CPLUSPLUS
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[#include "confdefs.h"
- #include
<boost/thread/thread.hpp>]],
- [[boost::thread thread; return 0;]]),
+ #include <boost/thread/thread.hpp>
+ #include <boost/bind.hpp>]],
+ [[boost::thread thread(boost::bind(&main))]]),
ax_cv_boost_thread="yes", ax_cv_boost_thread="no")
CXXFLAGS=$CXXFLAGS_SAVE
AC_LANG_RESTORE
Modified: code/player/trunk/client_libs/libplayerc++/playerc++.h
===================================================================
--- code/player/trunk/client_libs/libplayerc++/playerc++.h 2008-04-01
22:52:39 UTC (rev 4467)
+++ code/player/trunk/client_libs/libplayerc++/playerc++.h 2008-04-01
22:53:29 UTC (rev 4468)
@@ -62,6 +62,8 @@
#include "libplayerc++/clientproxy.h"
#include "libplayercore/interface_util.h"
+// Don't think we need to include these here
+/*
#ifdef HAVE_BOOST_SIGNALS
#include <boost/signal.hpp>
#include <boost/bind.hpp>
@@ -72,6 +74,7 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/xtime.hpp>
#endif
+*/
namespace PlayerCc
{
Modified: code/player/trunk/client_libs/libplayerc++/playerclient.h
===================================================================
--- code/player/trunk/client_libs/libplayerc++/playerclient.h 2008-04-01
22:52:39 UTC (rev 4467)
+++ code/player/trunk/client_libs/libplayerc++/playerclient.h 2008-04-01
22:53:29 UTC (rev 4468)
@@ -52,13 +52,13 @@
#ifdef HAVE_BOOST_SIGNALS
#include <boost/signal.hpp>
- #include <boost/bind.hpp>
#endif
#ifdef HAVE_BOOST_THREAD
#include <boost/thread/mutex.hpp>
#include <boost/thread/thread.hpp>
#include <boost/thread/xtime.hpp>
+ #include <boost/bind.hpp>
#else
// we have to define this so we don't have to
// comment out all the instances of scoped_lock
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
