Revision: 9111
http://sourceforge.net/p/playerstage/svn/9111
Author: jpgr87
Date: 2012-12-17 02:10:07 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
Fix TIME_UTC macro for boost >= 1.50
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc++/playerclient.cc
code/player/trunk/client_libs/libplayerc++/playerclient.h
Modified: code/player/trunk/client_libs/libplayerc++/playerclient.cc
===================================================================
--- code/player/trunk/client_libs/libplayerc++/playerclient.cc 2012-12-13
02:33:56 UTC (rev 9110)
+++ code/player/trunk/client_libs/libplayerc++/playerclient.cc 2012-12-17
02:10:07 UTC (rev 9111)
@@ -168,7 +168,7 @@
Read();
};
boost::xtime xt;
- boost::xtime_get(&xt, boost::TIME_UTC);
+ boost::xtime_get(&xt, boost::TIME_UTC_);
// we sleep for 0 seconds
boost::thread::sleep(xt);
}
Modified: code/player/trunk/client_libs/libplayerc++/playerclient.h
===================================================================
--- code/player/trunk/client_libs/libplayerc++/playerclient.h 2012-12-13
02:33:56 UTC (rev 9110)
+++ code/player/trunk/client_libs/libplayerc++/playerclient.h 2012-12-17
02:10:07 UTC (rev 9111)
@@ -71,6 +71,11 @@
#include <boost/thread/thread.hpp>
#include <boost/thread/xtime.hpp>
#include <boost/bind.hpp>
+ #include <boost/version.hpp>
+ #if BOOST_VERSION < 105000
+ #define TIME_UTC_ TIME_UTC
+ #endif
+
#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.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
