boost: Remove old boost
This commit is contained in:
William A. Kennington III
parent
5ae216558f
commit
1df867f008
@ -1,93 +0,0 @@
|
|||||||
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
|
|
||||||
, enableRelease ? true
|
|
||||||
, enableDebug ? false
|
|
||||||
, enableSingleThreaded ? false
|
|
||||||
, enableMultiThreaded ? true
|
|
||||||
, enableShared ? true
|
|
||||||
, enableStatic ? false
|
|
||||||
, enablePIC ? false
|
|
||||||
, taggedLayout ? false
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
variant = stdenv.lib.concatStringsSep ","
|
|
||||||
(stdenv.lib.optional enableRelease "release" ++
|
|
||||||
stdenv.lib.optional enableDebug "debug");
|
|
||||||
|
|
||||||
threading = stdenv.lib.concatStringsSep ","
|
|
||||||
(stdenv.lib.optional enableSingleThreaded "single" ++
|
|
||||||
stdenv.lib.optional enableMultiThreaded "multi");
|
|
||||||
|
|
||||||
link = stdenv.lib.concatStringsSep ","
|
|
||||||
(stdenv.lib.optional enableShared "shared" ++
|
|
||||||
stdenv.lib.optional enableStatic "static");
|
|
||||||
|
|
||||||
# To avoid library name collisions
|
|
||||||
finalLayout = if (taggedLayout || (enableRelease && enableDebug) ||
|
|
||||||
(enableSingleThreaded && enableMultiThreaded) ||
|
|
||||||
(enableShared && enableStatic)) then
|
|
||||||
"tagged" else "system";
|
|
||||||
|
|
||||||
cflags = if enablePIC then "cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC" else "";
|
|
||||||
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "boost-1.44.0";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://boost.org/";
|
|
||||||
description = "Collection of C++ libraries";
|
|
||||||
license = "boost-license";
|
|
||||||
|
|
||||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
|
||||||
};
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/boost/boost_1_44_0.tar.bz2";
|
|
||||||
sha256 = "1nvq36mvzr1fr85q0jh86rk3bk65s1y55jgqgzfg3lcpkl12ihs5";
|
|
||||||
};
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
buildInputs = [icu expat zlib bzip2 python];
|
|
||||||
|
|
||||||
configureScript = "./bootstrap.sh";
|
|
||||||
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
|
|
||||||
|
|
||||||
buildPhase = "./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
|
|
||||||
|
|
||||||
installPhase = ":";
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Patch to get rid of following error, experienced by some packages like encfs, bitcoin:
|
|
||||||
# terminate called after throwing an instance of 'std::runtime_error'
|
|
||||||
# what(): locale::facet::_S_create_c_locale name not valid
|
|
||||||
(fetchurl {
|
|
||||||
url = https://svn.boost.org/trac/boost/raw-attachment/ticket/4688/boost_filesystem.patch ;
|
|
||||||
sha256 = "15k91ihzs6190pnryh4cl0b3c2pjpl9d790mr14x16zq52y7px2d";
|
|
||||||
})
|
|
||||||
./time_utc_144.patch
|
|
||||||
./boost-149-cstdint.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
crossAttrs = rec {
|
|
||||||
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
|
|
||||||
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
|
|
||||||
# override them.
|
|
||||||
propagatedBuildInputs = buildInputs;
|
|
||||||
# We want to substitute the contents of configureFlags, removing thus the
|
|
||||||
# usual --build and --host added on cross building.
|
|
||||||
preConfigure = ''
|
|
||||||
export configureFlags="--prefix=$out --without-icu"
|
|
||||||
'';
|
|
||||||
buildPhase = ''
|
|
||||||
set -x
|
|
||||||
cat << EOF > user-config.jam
|
|
||||||
using gcc : cross : $crossConfig-g++ ;
|
|
||||||
EOF
|
|
||||||
./bjam -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,96 +0,0 @@
|
|||||||
{ stdenv, fetchurl, icu, expat, zlib, bzip2, python
|
|
||||||
, enableRelease ? true
|
|
||||||
, enableDebug ? false
|
|
||||||
, enableSingleThreaded ? false
|
|
||||||
, enableMultiThreaded ? true
|
|
||||||
, enableShared ? true
|
|
||||||
, enableStatic ? false
|
|
||||||
, enablePIC ? false
|
|
||||||
, enableExceptions ? false
|
|
||||||
}:
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
variant = stdenv.lib.concatStringsSep ","
|
|
||||||
(stdenv.lib.optional enableRelease "release" ++
|
|
||||||
stdenv.lib.optional enableDebug "debug");
|
|
||||||
|
|
||||||
threading = stdenv.lib.concatStringsSep ","
|
|
||||||
(stdenv.lib.optional enableSingleThreaded "single" ++
|
|
||||||
stdenv.lib.optional enableMultiThreaded "multi");
|
|
||||||
|
|
||||||
link = stdenv.lib.concatStringsSep ","
|
|
||||||
(stdenv.lib.optional enableShared "shared" ++
|
|
||||||
stdenv.lib.optional enableStatic "static");
|
|
||||||
|
|
||||||
# To avoid library name collisions
|
|
||||||
finalLayout = if ((enableRelease && enableDebug) ||
|
|
||||||
(enableSingleThreaded && enableMultiThreaded) ||
|
|
||||||
(enableShared && enableStatic)) then
|
|
||||||
"tagged" else "system";
|
|
||||||
|
|
||||||
cflags = if enablePIC && enableExceptions then
|
|
||||||
"cflags=-fPIC -fexceptions cxxflags=-fPIC linkflags=-fPIC"
|
|
||||||
else if enablePIC then
|
|
||||||
"cflags=-fPIC cxxflags=-fPIC linkflags=-fPIC"
|
|
||||||
else if enableExceptions then
|
|
||||||
"cflags=-fexceptions"
|
|
||||||
else
|
|
||||||
"";
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
name = "boost-1.49.0";
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
homepage = "http://boost.org/";
|
|
||||||
description = "Collection of C++ libraries";
|
|
||||||
license = "boost-license";
|
|
||||||
|
|
||||||
platforms = stdenv.lib.platforms.unix;
|
|
||||||
maintainers = [ stdenv.lib.maintainers.simons ];
|
|
||||||
};
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://sourceforge/boost/boost_1_49_0.tar.bz2";
|
|
||||||
sha256 = "0g0d33942rm073jgqqvj3znm3rk45b2y2lplfjpyg9q7amzqlx6x";
|
|
||||||
};
|
|
||||||
|
|
||||||
# See <http://svn.boost.org/trac/boost/ticket/4688>.
|
|
||||||
patches = [
|
|
||||||
./CVE-2013-0252.patch # https://svn.boost.org/trac/boost/ticket/7743
|
|
||||||
./boost_filesystem_post_1_49_0.patch
|
|
||||||
./time_utc.patch
|
|
||||||
./boost-149-cstdint.patch
|
|
||||||
] ++ (stdenv.lib.optional stdenv.isDarwin ./boost-149-darwin.patch );
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
buildInputs = [icu expat zlib bzip2 python];
|
|
||||||
|
|
||||||
configureScript = "./bootstrap.sh";
|
|
||||||
configureFlags = "--with-icu=${icu} --with-python=${python}/bin/python";
|
|
||||||
|
|
||||||
buildPhase = "./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat}/include -sEXPAT_LIBPATH=${expat}/lib --layout=${finalLayout} variant=${variant} threading=${threading} link=${link} ${cflags} install";
|
|
||||||
|
|
||||||
installPhase = ":";
|
|
||||||
|
|
||||||
crossAttrs = rec {
|
|
||||||
buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
|
|
||||||
# all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
|
|
||||||
# override them.
|
|
||||||
propagatedBuildInputs = buildInputs;
|
|
||||||
# We want to substitute the contents of configureFlags, removing thus the
|
|
||||||
# usual --build and --host added on cross building.
|
|
||||||
preConfigure = ''
|
|
||||||
export configureFlags="--prefix=$out --without-icu"
|
|
||||||
'';
|
|
||||||
buildPhase = ''
|
|
||||||
set -x
|
|
||||||
cat << EOF > user-config.jam
|
|
||||||
using gcc : cross : $crossConfig-g++ ;
|
|
||||||
EOF
|
|
||||||
./b2 -j$NIX_BUILD_CORES -sEXPAT_INCLUDE=${expat.crossDrv}/include -sEXPAT_LIBPATH=${expat.crossDrv}/lib --layout=${finalLayout} --user-config=user-config.jam toolset=gcc-cross variant=${variant} threading=${threading} link=${link} ${cflags} --without-python install
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@ -1,48 +0,0 @@
|
|||||||
Index: /boost/locale/utf.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /boost/locale/utf.hpp (revision 78304)
|
|
||||||
+++ /boost/locale/utf.hpp (revision 81590)
|
|
||||||
@@ -220,4 +220,6 @@
|
|
||||||
return incomplete;
|
|
||||||
tmp = *p++;
|
|
||||||
+ if (!is_trail(tmp))
|
|
||||||
+ return illegal;
|
|
||||||
c = (c << 6) | ( tmp & 0x3F);
|
|
||||||
case 2:
|
|
||||||
@@ -225,4 +227,6 @@
|
|
||||||
return incomplete;
|
|
||||||
tmp = *p++;
|
|
||||||
+ if (!is_trail(tmp))
|
|
||||||
+ return illegal;
|
|
||||||
c = (c << 6) | ( tmp & 0x3F);
|
|
||||||
case 1:
|
|
||||||
@@ -230,4 +234,6 @@
|
|
||||||
return incomplete;
|
|
||||||
tmp = *p++;
|
|
||||||
+ if (!is_trail(tmp))
|
|
||||||
+ return illegal;
|
|
||||||
c = (c << 6) | ( tmp & 0x3F);
|
|
||||||
}
|
|
||||||
Index: /libs/locale/test/test_codepage_converter.cpp
|
|
||||||
===================================================================
|
|
||||||
--- /libs/locale/test/test_codepage_converter.cpp (revision 73786)
|
|
||||||
+++ /libs/locale/test/test_codepage_converter.cpp (revision 81590)
|
|
||||||
@@ -140,4 +140,18 @@
|
|
||||||
TEST_TO("\xf8\x90\x80\x80\x80",illegal); // 400 0000
|
|
||||||
TEST_TO("\xfd\xbf\xbf\xbf\xbf\xbf",illegal); // 7fff ffff
|
|
||||||
+
|
|
||||||
+ std::cout << "-- Invalid trail" << std::endl;
|
|
||||||
+ TEST_TO("\xC2\x7F",illegal);
|
|
||||||
+ TEST_TO("\xdf\x7F",illegal);
|
|
||||||
+ TEST_TO("\xe0\x7F\x80",illegal);
|
|
||||||
+ TEST_TO("\xef\xbf\x7F",illegal);
|
|
||||||
+ TEST_TO("\xe0\x7F\x80",illegal);
|
|
||||||
+ TEST_TO("\xef\xbf\x7F",illegal);
|
|
||||||
+ TEST_TO("\xf0\x7F\x80\x80",illegal);
|
|
||||||
+ TEST_TO("\xf4\x7f\xbf\xbf",illegal);
|
|
||||||
+ TEST_TO("\xf0\x90\x7F\x80",illegal);
|
|
||||||
+ TEST_TO("\xf4\x8f\x7F\xbf",illegal);
|
|
||||||
+ TEST_TO("\xf0\x90\x80\x7F",illegal);
|
|
||||||
+ TEST_TO("\xf4\x8f\xbf\x7F",illegal);
|
|
||||||
|
|
||||||
std::cout << "-- Invalid length" << std::endl;
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
diff -ru -x '*~' boost_1_49_0-orig/boost/cstdint.hpp boost_1_49_0/boost/cstdint.hpp
|
|
||||||
--- boost_1_49_0-orig/boost/cstdint.hpp 2012-01-29 22:58:13.000000000 +0100
|
|
||||||
+++ boost_1_49_0/boost/cstdint.hpp 2013-12-10 11:48:19.304042208 +0100
|
|
||||||
@@ -41,7 +41,10 @@
|
|
||||||
// so we disable use of stdint.h when GLIBC does not define __GLIBC_HAVE_LONG_LONG.
|
|
||||||
// See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
|
|
||||||
//
|
|
||||||
-#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
|
|
||||||
+#if defined(BOOST_HAS_STDINT_H) \
|
|
||||||
+ && (!defined(__GLIBC__) \
|
|
||||||
+ || defined(__GLIBC_HAVE_LONG_LONG) \
|
|
||||||
+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
|
|
||||||
|
|
||||||
// The following #include is an implementation artifact; not part of interface.
|
|
||||||
# ifdef __hpux
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
diff -rc boost_1_49_0/tools/build/v2/tools/darwin.jam boost_1_49_0-new/tools/build/v2/tools/darwin.jam
|
|
||||||
*** boost_1_49_0/tools/build/v2/tools/darwin.jam Mon Jun 6 22:36:21 2011
|
|
||||||
--- boost_1_49_0-new/tools/build/v2/tools/darwin.jam Thu May 23 22:07:45 2013
|
|
||||||
***************
|
|
||||||
*** 498,504 ****
|
|
||||||
flags darwin.compile OPTIONS <link>shared : -dynamic ;
|
|
||||||
|
|
||||||
# Misc options.
|
|
||||||
! flags darwin.compile OPTIONS : -no-cpp-precomp -gdwarf-2 -fexceptions ;
|
|
||||||
#~ flags darwin.link OPTIONS : -fexceptions ;
|
|
||||||
|
|
||||||
# Add the framework names to use.
|
|
||||||
--- 498,504 ----
|
|
||||||
flags darwin.compile OPTIONS <link>shared : -dynamic ;
|
|
||||||
|
|
||||||
# Misc options.
|
|
||||||
! flags darwin.compile OPTIONS : -gdwarf-2 -fexceptions ;
|
|
||||||
#~ flags darwin.link OPTIONS : -fexceptions ;
|
|
||||||
|
|
||||||
# Add the framework names to use.
|
|
||||||
diff -rc boost_1_49_0/tools/build/v2/tools/darwin.py boost_1_49_0-new/tools/build/v2/tools/darwin.py
|
|
||||||
*** boost_1_49_0/tools/build/v2/tools/darwin.py Wed Oct 28 08:47:51 2009
|
|
||||||
--- boost_1_49_0-new/tools/build/v2/tools/darwin.py Thu May 23 21:58:12 2013
|
|
||||||
***************
|
|
||||||
*** 37,43 ****
|
|
||||||
feature.feature ('framework', [], ['free'])
|
|
||||||
|
|
||||||
toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
|
|
||||||
! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double', '-no-cpp-precomp'])
|
|
||||||
toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
|
|
||||||
|
|
||||||
toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')
|
|
||||||
--- 37,43 ----
|
|
||||||
feature.feature ('framework', [], ['free'])
|
|
||||||
|
|
||||||
toolset.flags ('darwin.compile', 'OPTIONS', '<link>shared', ['-dynamic'])
|
|
||||||
! toolset.flags ('darwin.compile', 'OPTIONS', None, ['-Wno-long-double'])
|
|
||||||
toolset.flags ('darwin.compile.c++', 'OPTIONS', None, ['-fcoalesce-templates'])
|
|
||||||
|
|
||||||
toolset.flags ('darwin.link', 'FRAMEWORK', '<framework>')
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
diff -ubr boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp
|
|
||||||
--- boost_1_49_0/libs/filesystem/v2/src/v2_path.cpp 2011-01-11 22:39:33.000000000 +0100
|
|
||||||
+++ boost_1_49_0-patched/libs/filesystem/v2/src/v2_path.cpp 2012-02-25 20:00:33.628767485 +0100
|
|
||||||
@@ -45,7 +45,7 @@
|
|
||||||
{
|
|
||||||
#if !defined(macintosh) && !defined(__APPLE__) && !defined(__APPLE_CC__)
|
|
||||||
// ISO C calls this "the locale-specific native environment":
|
|
||||||
- static std::locale lc("");
|
|
||||||
+ static std::locale lc;
|
|
||||||
#else // Mac OS
|
|
||||||
// "All BSD system functions expect their string parameters to be in UTF-8 encoding
|
|
||||||
// and nothing else."
|
|
||||||
@ -1,320 +0,0 @@
|
|||||||
From: https://build.opensuse.org/package/view_file?file=boost-time_utc.patch&package=boost&project=Application%3AGeo
|
|
||||||
|
|
||||||
From: https://svn.boost.org/trac/boost/changeset/78802
|
|
||||||
|
|
||||||
Message:
|
|
||||||
Thread: fix TIME_UTC, WINVER, constexpr for tags, and don't use local files
|
|
||||||
|
|
||||||
Only the TIME_UTC_ change is taken
|
|
||||||
|
|
||||||
Index: boost_1_49_0/boost/thread/xtime.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/boost/thread/xtime.hpp
|
|
||||||
+++ boost_1_49_0/boost/thread/xtime.hpp
|
|
||||||
@@ -2,7 +2,7 @@
|
|
||||||
// William E. Kempf
|
|
||||||
// Copyright (C) 2007-8 Anthony Williams
|
|
||||||
//
|
|
||||||
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
||||||
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
||||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
||||||
|
|
||||||
#ifndef BOOST_XTIME_WEK070601_HPP
|
|
||||||
@@ -20,7 +20,7 @@ namespace boost {
|
|
||||||
|
|
||||||
enum xtime_clock_types
|
|
||||||
{
|
|
||||||
- TIME_UTC=1
|
|
||||||
+ TIME_UTC_=1
|
|
||||||
// TIME_TAI,
|
|
||||||
// TIME_MONOTONIC,
|
|
||||||
// TIME_PROCESS,
|
|
||||||
@@ -53,14 +53,14 @@ struct xtime
|
|
||||||
boost::posix_time::microseconds((nsec+500)/1000);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+
|
|
||||||
};
|
|
||||||
|
|
||||||
inline xtime get_xtime(boost::system_time const& abs_time)
|
|
||||||
{
|
|
||||||
xtime res;
|
|
||||||
boost::posix_time::time_duration const time_since_epoch=abs_time-boost::posix_time::from_time_t(0);
|
|
||||||
-
|
|
||||||
+
|
|
||||||
res.sec=static_cast<xtime::xtime_sec_t>(time_since_epoch.total_seconds());
|
|
||||||
res.nsec=static_cast<xtime::xtime_nsec_t>(time_since_epoch.fractional_seconds()*(1000000000/time_since_epoch.ticks_per_second()));
|
|
||||||
return res;
|
|
||||||
@@ -68,7 +68,7 @@ inline xtime get_xtime(boost::system_tim
|
|
||||||
|
|
||||||
inline int xtime_get(struct xtime* xtp, int clock_type)
|
|
||||||
{
|
|
||||||
- if (clock_type == TIME_UTC)
|
|
||||||
+ if (clock_type == TIME_UTC_)
|
|
||||||
{
|
|
||||||
*xtp=get_xtime(get_system_time());
|
|
||||||
return clock_type;
|
|
||||||
@@ -81,7 +81,7 @@ inline int xtime_cmp(const xtime& xt1, c
|
|
||||||
{
|
|
||||||
if (xt1.sec == xt2.sec)
|
|
||||||
return (int)(xt1.nsec - xt2.nsec);
|
|
||||||
- else
|
|
||||||
+ else
|
|
||||||
return (xt1.sec > xt2.sec) ? 1 : -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: boost_1_49_0/libs/thread/example/starvephil.cpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/example/starvephil.cpp
|
|
||||||
+++ boost_1_49_0/libs/thread/example/starvephil.cpp
|
|
||||||
@@ -50,7 +50,7 @@ public:
|
|
||||||
<< "very hot ..." << std::endl;
|
|
||||||
}
|
|
||||||
boost::xtime xt;
|
|
||||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 3;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
m_chickens += value;
|
|
||||||
@@ -85,7 +85,7 @@ void chef()
|
|
||||||
std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
|
|
||||||
}
|
|
||||||
boost::xtime xt;
|
|
||||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 2;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
{
|
|
||||||
@@ -111,7 +111,7 @@ struct phil
|
|
||||||
if (m_id > 0)
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 3;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
}
|
|
||||||
Index: boost_1_49_0/libs/thread/example/tennis.cpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/example/tennis.cpp
|
|
||||||
+++ boost_1_49_0/libs/thread/example/tennis.cpp
|
|
||||||
@@ -1,7 +1,7 @@
|
|
||||||
// Copyright (C) 2001-2003
|
|
||||||
// William E. Kempf
|
|
||||||
//
|
|
||||||
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
||||||
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
||||||
// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
|
||||||
|
|
||||||
#include <boost/thread/mutex.hpp>
|
|
||||||
@@ -104,7 +104,7 @@ int main(int argc, char* argv[])
|
|
||||||
boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 1;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
{
|
|
||||||
Index: boost_1_49_0/libs/thread/example/thread.cpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/example/thread.cpp
|
|
||||||
+++ boost_1_49_0/libs/thread/example/thread.cpp
|
|
||||||
@@ -14,7 +14,7 @@ struct thread_alarm
|
|
||||||
void operator()()
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += m_secs;
|
|
||||||
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
Index: boost_1_49_0/libs/thread/example/xtime.cpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/example/xtime.cpp
|
|
||||||
+++ boost_1_49_0/libs/thread/example/xtime.cpp
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
int main(int argc, char* argv[])
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
- boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
+ boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 1;
|
|
||||||
boost::thread::sleep(xt); // Sleep for 1 second
|
|
||||||
}
|
|
||||||
Index: boost_1_49_0/libs/thread/src/pthread/thread.cpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/src/pthread/thread.cpp
|
|
||||||
+++ boost_1_49_0/libs/thread/src/pthread/thread.cpp
|
|
||||||
@@ -23,7 +23,7 @@
|
|
||||||
#include <unistd.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include "timeconv.inl"
|
|
||||||
+#include <libs/thread/src/pthread/timeconv.inl>
|
|
||||||
|
|
||||||
namespace boost
|
|
||||||
{
|
|
||||||
@@ -354,7 +354,7 @@ namespace boost
|
|
||||||
cond.timed_wait(lock, xt);
|
|
||||||
# endif
|
|
||||||
xtime cur;
|
|
||||||
- xtime_get(&cur, TIME_UTC);
|
|
||||||
+ xtime_get(&cur, TIME_UTC_);
|
|
||||||
if (xtime_cmp(xt, cur) <= 0)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -369,7 +369,7 @@ namespace boost
|
|
||||||
BOOST_VERIFY(!pthread_yield());
|
|
||||||
# else
|
|
||||||
xtime xt;
|
|
||||||
- xtime_get(&xt, TIME_UTC);
|
|
||||||
+ xtime_get(&xt, TIME_UTC_);
|
|
||||||
sleep(xt);
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
Index: boost_1_49_0/libs/thread/src/pthread/timeconv.inl
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/src/pthread/timeconv.inl
|
|
||||||
+++ boost_1_49_0/libs/thread/src/pthread/timeconv.inl
|
|
||||||
@@ -20,8 +20,8 @@ const int NANOSECONDS_PER_MICROSECOND =
|
|
||||||
inline void to_time(int milliseconds, boost::xtime& xt)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
|
|
||||||
+ res = boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
|
|
||||||
|
|
||||||
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
|
|
||||||
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
|
|
||||||
@@ -56,8 +56,8 @@ inline void to_timespec_duration(const b
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
|
|
||||||
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
{
|
|
||||||
@@ -87,8 +87,8 @@ inline void to_duration(boost::xtime xt,
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
|
|
||||||
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
milliseconds = 0;
|
|
||||||
@@ -109,8 +109,8 @@ inline void to_microduration(boost::xtim
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
- BOOST_ASSERT(res == boost::TIME_UTC); (void)res;
|
|
||||||
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
+ BOOST_ASSERT(res == boost::TIME_UTC_); (void)res;
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
microseconds = 0;
|
|
||||||
Index: boost_1_49_0/libs/thread/src/win32/timeconv.inl
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/src/win32/timeconv.inl
|
|
||||||
+++ boost_1_49_0/libs/thread/src/win32/timeconv.inl
|
|
||||||
@@ -17,8 +17,8 @@ const int NANOSECONDS_PER_MICROSECOND =
|
|
||||||
inline void to_time(int milliseconds, boost::xtime& xt)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
- assert(res == boost::TIME_UTC);
|
|
||||||
+ res = boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
+ assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
|
|
||||||
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
|
|
||||||
@@ -54,8 +54,8 @@ inline void to_timespec_duration(const b
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
- assert(res == boost::TIME_UTC);
|
|
||||||
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
+ assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
{
|
|
||||||
@@ -85,8 +85,8 @@ inline void to_duration(boost::xtime xt,
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
- assert(res == boost::TIME_UTC);
|
|
||||||
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
+ assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
milliseconds = 0;
|
|
||||||
@@ -107,8 +107,8 @@ inline void to_microduration(boost::xtim
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
- res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
- assert(res == boost::TIME_UTC);
|
|
||||||
+ res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
+ assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
microseconds = 0;
|
|
||||||
Index: boost_1_49_0/libs/thread/test/test_xtime.cpp
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/test/test_xtime.cpp
|
|
||||||
+++ boost_1_49_0/libs/thread/test/test_xtime.cpp
|
|
||||||
@@ -17,8 +17,8 @@ void test_xtime_cmp()
|
|
||||||
{
|
|
||||||
boost::xtime xt1, xt2, cur;
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
- boost::xtime_get(&cur, boost::TIME_UTC),
|
|
||||||
- static_cast<int>(boost::TIME_UTC));
|
|
||||||
+ boost::xtime_get(&cur, boost::TIME_UTC_),
|
|
||||||
+ static_cast<int>(boost::TIME_UTC_));
|
|
||||||
|
|
||||||
xt1 = xt2 = cur;
|
|
||||||
xt1.nsec -= 1;
|
|
||||||
@@ -42,14 +42,14 @@ void test_xtime_get()
|
|
||||||
boost::xtime orig, cur, old;
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
boost::xtime_get(&orig,
|
|
||||||
- boost::TIME_UTC), static_cast<int>(boost::TIME_UTC));
|
|
||||||
+ boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC_));
|
|
||||||
old = orig;
|
|
||||||
|
|
||||||
for (int x=0; x < 100; ++x)
|
|
||||||
{
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
- boost::xtime_get(&cur, boost::TIME_UTC),
|
|
||||||
- static_cast<int>(boost::TIME_UTC));
|
|
||||||
+ boost::xtime_get(&cur, boost::TIME_UTC_),
|
|
||||||
+ static_cast<int>(boost::TIME_UTC_));
|
|
||||||
BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
|
|
||||||
BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
|
|
||||||
old = cur;
|
|
||||||
Index: boost_1_49_0/libs/thread/test/util.inl
|
|
||||||
===================================================================
|
|
||||||
--- boost_1_49_0.orig/libs/thread/test/util.inl
|
|
||||||
+++ boost_1_49_0/libs/thread/test/util.inl
|
|
||||||
@@ -28,8 +28,8 @@ inline boost::xtime delay(int secs, int
|
|
||||||
const int NANOSECONDS_PER_MILLISECOND = 1000000;
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
- if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC))
|
|
||||||
- BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC");
|
|
||||||
+ if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC_))
|
|
||||||
+ BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_");
|
|
||||||
|
|
||||||
nsecs += xt.nsec;
|
|
||||||
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
|
|
||||||
@ -1,520 +0,0 @@
|
|||||||
diff -rc boost_1_44_0/boost/thread/xtime.hpp boost_1_44_0-new/boost/thread/xtime.hpp
|
|
||||||
*** boost_1_44_0/boost/thread/xtime.hpp 2008-06-18 15:01:08.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/boost/thread/xtime.hpp 2013-04-12 14:00:27.125713549 +0200
|
|
||||||
***************
|
|
||||||
*** 20,26 ****
|
|
||||||
|
|
||||||
enum xtime_clock_types
|
|
||||||
{
|
|
||||||
! TIME_UTC=1
|
|
||||||
// TIME_TAI,
|
|
||||||
// TIME_MONOTONIC,
|
|
||||||
// TIME_PROCESS,
|
|
||||||
--- 20,26 ----
|
|
||||||
|
|
||||||
enum xtime_clock_types
|
|
||||||
{
|
|
||||||
! TIME_UTC_=1
|
|
||||||
// TIME_TAI,
|
|
||||||
// TIME_MONOTONIC,
|
|
||||||
// TIME_PROCESS,
|
|
||||||
***************
|
|
||||||
*** 68,74 ****
|
|
||||||
|
|
||||||
inline int xtime_get(struct xtime* xtp, int clock_type)
|
|
||||||
{
|
|
||||||
! if (clock_type == TIME_UTC)
|
|
||||||
{
|
|
||||||
*xtp=get_xtime(get_system_time());
|
|
||||||
return clock_type;
|
|
||||||
--- 68,74 ----
|
|
||||||
|
|
||||||
inline int xtime_get(struct xtime* xtp, int clock_type)
|
|
||||||
{
|
|
||||||
! if (clock_type == TIME_UTC_)
|
|
||||||
{
|
|
||||||
*xtp=get_xtime(get_system_time());
|
|
||||||
return clock_type;
|
|
||||||
diff -rc boost_1_44_0/libs/interprocess/test/condition_test_template.hpp boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp
|
|
||||||
*** boost_1_44_0/libs/interprocess/test/condition_test_template.hpp 2009-10-15 20:45:53.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/interprocess/test/condition_test_template.hpp 2013-04-12 14:00:20.215658855 +0200
|
|
||||||
***************
|
|
||||||
*** 49,56 ****
|
|
||||||
const int NANOSECONDS_PER_MILLISECOND = 1000000;
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
! int ret = boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
! assert(ret == static_cast<int>(boost::TIME_UTC));(void)ret;
|
|
||||||
nsecs += xt.nsec;
|
|
||||||
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
|
|
||||||
secs += msecs / MILLISECONDS_PER_SECOND;
|
|
||||||
--- 49,56 ----
|
|
||||||
const int NANOSECONDS_PER_MILLISECOND = 1000000;
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
! int ret = boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
! assert(ret == static_cast<int>(boost::TIME_UTC_));(void)ret;
|
|
||||||
nsecs += xt.nsec;
|
|
||||||
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
|
|
||||||
secs += msecs / MILLISECONDS_PER_SECOND;
|
|
||||||
diff -rc boost_1_44_0/libs/interprocess/test/util.hpp boost_1_44_0-new/libs/interprocess/test/util.hpp
|
|
||||||
*** boost_1_44_0/libs/interprocess/test/util.hpp 2009-10-15 20:45:53.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/interprocess/test/util.hpp 2013-04-12 14:00:20.219658887 +0200
|
|
||||||
***************
|
|
||||||
*** 71,77 ****
|
|
||||||
boost::xtime xsecs(int secs)
|
|
||||||
{
|
|
||||||
boost::xtime ret;
|
|
||||||
! boost::xtime_get(&ret, boost::TIME_UTC);
|
|
||||||
ret.sec += secs;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
--- 71,77 ----
|
|
||||||
boost::xtime xsecs(int secs)
|
|
||||||
{
|
|
||||||
boost::xtime ret;
|
|
||||||
! boost::xtime_get(&ret, boost::TIME_UTC_);
|
|
||||||
ret.sec += secs;
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
diff -rc boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp
|
|
||||||
*** boost_1_44_0/libs/spirit/classic/test/grammar_mt_tests.cpp 2008-06-22 17:05:38.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/spirit/classic/test/grammar_mt_tests.cpp 2013-04-12 14:00:18.836647940 +0200
|
|
||||||
***************
|
|
||||||
*** 70,76 ****
|
|
||||||
{
|
|
||||||
static long const nanoseconds_per_second = 1000L*1000L*1000L;
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.nsec+=1000*1000*milliseconds;
|
|
||||||
while (xt.nsec > nanoseconds_per_second)
|
|
||||||
{
|
|
||||||
--- 70,76 ----
|
|
||||||
{
|
|
||||||
static long const nanoseconds_per_second = 1000L*1000L*1000L;
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.nsec+=1000*1000*milliseconds;
|
|
||||||
while (xt.nsec > nanoseconds_per_second)
|
|
||||||
{
|
|
||||||
diff -rc boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp
|
|
||||||
*** boost_1_44_0/libs/spirit/classic/test/owi_mt_tests.cpp 2008-06-22 17:05:38.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/spirit/classic/test/owi_mt_tests.cpp 2013-04-12 14:00:18.836647940 +0200
|
|
||||||
***************
|
|
||||||
*** 86,92 ****
|
|
||||||
return test_size;
|
|
||||||
|
|
||||||
boost::xtime now;
|
|
||||||
! boost::xtime_get(&now, boost::TIME_UTC);
|
|
||||||
unsigned long seconds = now.sec - start_time.sec;
|
|
||||||
if (seconds < 4)
|
|
||||||
{
|
|
||||||
--- 86,92 ----
|
|
||||||
return test_size;
|
|
||||||
|
|
||||||
boost::xtime now;
|
|
||||||
! boost::xtime_get(&now, boost::TIME_UTC_);
|
|
||||||
unsigned long seconds = now.sec - start_time.sec;
|
|
||||||
if (seconds < 4)
|
|
||||||
{
|
|
||||||
***************
|
|
||||||
*** 187,193 ****
|
|
||||||
void concurrent_creation_of_objects()
|
|
||||||
{
|
|
||||||
{
|
|
||||||
! boost::xtime_get(&start_time, boost::TIME_UTC);
|
|
||||||
boost::thread thread1(callable_ref(test1));
|
|
||||||
boost::thread thread2(callable_ref(test2));
|
|
||||||
boost::thread thread3(callable_ref(test3));
|
|
||||||
--- 187,193 ----
|
|
||||||
void concurrent_creation_of_objects()
|
|
||||||
{
|
|
||||||
{
|
|
||||||
! boost::xtime_get(&start_time, boost::TIME_UTC_);
|
|
||||||
boost::thread thread1(callable_ref(test1));
|
|
||||||
boost::thread thread2(callable_ref(test2));
|
|
||||||
boost::thread thread3(callable_ref(test3));
|
|
||||||
diff -rc boost_1_44_0/libs/thread/example/starvephil.cpp boost_1_44_0-new/libs/thread/example/starvephil.cpp
|
|
||||||
*** boost_1_44_0/libs/thread/example/starvephil.cpp 2006-09-14 23:51:01.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/example/starvephil.cpp 2013-04-12 14:00:19.413652507 +0200
|
|
||||||
***************
|
|
||||||
*** 50,56 ****
|
|
||||||
<< "very hot ..." << std::endl;
|
|
||||||
}
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.sec += 3;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
m_chickens += value;
|
|
||||||
--- 50,56 ----
|
|
||||||
<< "very hot ..." << std::endl;
|
|
||||||
}
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 3;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
m_chickens += value;
|
|
||||||
***************
|
|
||||||
*** 85,91 ****
|
|
||||||
std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
|
|
||||||
}
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.sec += 2;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
{
|
|
||||||
--- 85,91 ----
|
|
||||||
std::cout << "(" << clock() << ") Chef: cooking ..." << std::endl;
|
|
||||||
}
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 2;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
{
|
|
||||||
***************
|
|
||||||
*** 111,117 ****
|
|
||||||
if (m_id > 0)
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.sec += 3;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
}
|
|
||||||
--- 111,117 ----
|
|
||||||
if (m_id > 0)
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 3;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
}
|
|
||||||
diff -rc boost_1_44_0/libs/thread/example/tennis.cpp boost_1_44_0-new/libs/thread/example/tennis.cpp
|
|
||||||
*** boost_1_44_0/libs/thread/example/tennis.cpp 2009-10-19 11:18:13.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/example/tennis.cpp 2013-04-12 14:00:19.412652499 +0200
|
|
||||||
***************
|
|
||||||
*** 104,110 ****
|
|
||||||
boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.sec += 1;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
{
|
|
||||||
--- 104,110 ----
|
|
||||||
boost::thread thrdb(thread_adapter(&player, (void*)PLAYER_B));
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 1;
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
{
|
|
||||||
diff -rc boost_1_44_0/libs/thread/example/thread.cpp boost_1_44_0-new/libs/thread/example/thread.cpp
|
|
||||||
*** boost_1_44_0/libs/thread/example/thread.cpp 2006-09-14 23:51:01.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/example/thread.cpp 2013-04-12 14:00:19.414652515 +0200
|
|
||||||
***************
|
|
||||||
*** 14,20 ****
|
|
||||||
void operator()()
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.sec += m_secs;
|
|
||||||
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
--- 14,20 ----
|
|
||||||
void operator()()
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += m_secs;
|
|
||||||
|
|
||||||
boost::thread::sleep(xt);
|
|
||||||
diff -rc boost_1_44_0/libs/thread/example/xtime.cpp boost_1_44_0-new/libs/thread/example/xtime.cpp
|
|
||||||
*** boost_1_44_0/libs/thread/example/xtime.cpp 2006-09-14 23:51:01.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/example/xtime.cpp 2013-04-12 14:00:19.413652507 +0200
|
|
||||||
***************
|
|
||||||
*** 10,16 ****
|
|
||||||
int main(int argc, char* argv[])
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
xt.sec += 1;
|
|
||||||
boost::thread::sleep(xt); // Sleep for 1 second
|
|
||||||
}
|
|
||||||
--- 10,16 ----
|
|
||||||
int main(int argc, char* argv[])
|
|
||||||
{
|
|
||||||
boost::xtime xt;
|
|
||||||
! boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
xt.sec += 1;
|
|
||||||
boost::thread::sleep(xt); // Sleep for 1 second
|
|
||||||
}
|
|
||||||
diff -rc boost_1_44_0/libs/thread/src/pthread/thread.cpp boost_1_44_0-new/libs/thread/src/pthread/thread.cpp
|
|
||||||
*** boost_1_44_0/libs/thread/src/pthread/thread.cpp 2010-07-09 21:13:09.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/src/pthread/thread.cpp 2013-04-12 14:00:19.415652523 +0200
|
|
||||||
***************
|
|
||||||
*** 350,356 ****
|
|
||||||
cond.timed_wait(lock, xt);
|
|
||||||
# endif
|
|
||||||
xtime cur;
|
|
||||||
! xtime_get(&cur, TIME_UTC);
|
|
||||||
if (xtime_cmp(xt, cur) <= 0)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
--- 350,356 ----
|
|
||||||
cond.timed_wait(lock, xt);
|
|
||||||
# endif
|
|
||||||
xtime cur;
|
|
||||||
! xtime_get(&cur, TIME_UTC_);
|
|
||||||
if (xtime_cmp(xt, cur) <= 0)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
***************
|
|
||||||
*** 365,371 ****
|
|
||||||
BOOST_VERIFY(!pthread_yield());
|
|
||||||
# else
|
|
||||||
xtime xt;
|
|
||||||
! xtime_get(&xt, TIME_UTC);
|
|
||||||
sleep(xt);
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
--- 365,371 ----
|
|
||||||
BOOST_VERIFY(!pthread_yield());
|
|
||||||
# else
|
|
||||||
xtime xt;
|
|
||||||
! xtime_get(&xt, TIME_UTC_);
|
|
||||||
sleep(xt);
|
|
||||||
# endif
|
|
||||||
}
|
|
||||||
diff -rc boost_1_44_0/libs/thread/src/pthread/timeconv.inl boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl
|
|
||||||
*** boost_1_44_0/libs/thread/src/pthread/timeconv.inl 2010-04-01 17:04:15.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/src/pthread/timeconv.inl 2013-04-12 14:00:19.414652515 +0200
|
|
||||||
***************
|
|
||||||
*** 20,27 ****
|
|
||||||
inline void to_time(int milliseconds, boost::xtime& xt)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
|
|
||||||
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
|
|
||||||
--- 20,27 ----
|
|
||||||
inline void to_time(int milliseconds, boost::xtime& xt)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
|
|
||||||
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
|
|
||||||
***************
|
|
||||||
*** 57,64 ****
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
{
|
|
||||||
--- 57,64 ----
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
{
|
|
||||||
***************
|
|
||||||
*** 88,95 ****
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
milliseconds = 0;
|
|
||||||
--- 88,95 ----
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
milliseconds = 0;
|
|
||||||
***************
|
|
||||||
*** 110,117 ****
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
microseconds = 0;
|
|
||||||
--- 110,117 ----
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
! BOOST_ASSERT(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
microseconds = 0;
|
|
||||||
diff -rc boost_1_44_0/libs/thread/src/win32/timeconv.inl boost_1_44_0-new/libs/thread/src/win32/timeconv.inl
|
|
||||||
*** boost_1_44_0/libs/thread/src/win32/timeconv.inl 2007-11-25 19:38:02.000000000 +0100
|
|
||||||
--- boost_1_44_0-new/libs/thread/src/win32/timeconv.inl 2013-04-12 14:00:19.416652531 +0200
|
|
||||||
***************
|
|
||||||
*** 17,24 ****
|
|
||||||
inline void to_time(int milliseconds, boost::xtime& xt)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&xt, boost::TIME_UTC);
|
|
||||||
! assert(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
|
|
||||||
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
|
|
||||||
--- 17,24 ----
|
|
||||||
inline void to_time(int milliseconds, boost::xtime& xt)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&xt, boost::TIME_UTC_);
|
|
||||||
! assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
xt.sec += (milliseconds / MILLISECONDS_PER_SECOND);
|
|
||||||
xt.nsec += ((milliseconds % MILLISECONDS_PER_SECOND) *
|
|
||||||
***************
|
|
||||||
*** 54,61 ****
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
! assert(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
{
|
|
||||||
--- 54,61 ----
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
! assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
{
|
|
||||||
***************
|
|
||||||
*** 85,92 ****
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
! assert(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
milliseconds = 0;
|
|
||||||
--- 85,92 ----
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
! assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
milliseconds = 0;
|
|
||||||
***************
|
|
||||||
*** 107,114 ****
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC);
|
|
||||||
! assert(res == boost::TIME_UTC);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
microseconds = 0;
|
|
||||||
--- 107,114 ----
|
|
||||||
{
|
|
||||||
boost::xtime cur;
|
|
||||||
int res = 0;
|
|
||||||
! res = boost::xtime_get(&cur, boost::TIME_UTC_);
|
|
||||||
! assert(res == boost::TIME_UTC_);
|
|
||||||
|
|
||||||
if (boost::xtime_cmp(xt, cur) <= 0)
|
|
||||||
microseconds = 0;
|
|
||||||
diff -rc boost_1_44_0/libs/thread/test/test_xtime.cpp boost_1_44_0-new/libs/thread/test/test_xtime.cpp
|
|
||||||
*** boost_1_44_0/libs/thread/test/test_xtime.cpp 2008-07-08 09:44:55.000000000 +0200
|
|
||||||
--- boost_1_44_0-new/libs/thread/test/test_xtime.cpp 2013-04-12 14:00:19.432652657 +0200
|
|
||||||
***************
|
|
||||||
*** 17,24 ****
|
|
||||||
{
|
|
||||||
boost::xtime xt1, xt2, cur;
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
! boost::xtime_get(&cur, boost::TIME_UTC),
|
|
||||||
! static_cast<int>(boost::TIME_UTC));
|
|
||||||
|
|
||||||
xt1 = xt2 = cur;
|
|
||||||
xt1.nsec -= 1;
|
|
||||||
--- 17,24 ----
|
|
||||||
{
|
|
||||||
boost::xtime xt1, xt2, cur;
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
! boost::xtime_get(&cur, boost::TIME_UTC_),
|
|
||||||
! static_cast<int>(boost::TIME_UTC_));
|
|
||||||
|
|
||||||
xt1 = xt2 = cur;
|
|
||||||
xt1.nsec -= 1;
|
|
||||||
***************
|
|
||||||
*** 42,55 ****
|
|
||||||
boost::xtime orig, cur, old;
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
boost::xtime_get(&orig,
|
|
||||||
! boost::TIME_UTC), static_cast<int>(boost::TIME_UTC));
|
|
||||||
old = orig;
|
|
||||||
|
|
||||||
for (int x=0; x < 100; ++x)
|
|
||||||
{
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
! boost::xtime_get(&cur, boost::TIME_UTC),
|
|
||||||
! static_cast<int>(boost::TIME_UTC));
|
|
||||||
BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
|
|
||||||
BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
|
|
||||||
old = cur;
|
|
||||||
--- 42,55 ----
|
|
||||||
boost::xtime orig, cur, old;
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
boost::xtime_get(&orig,
|
|
||||||
! boost::TIME_UTC_), static_cast<int>(boost::TIME_UTC));
|
|
||||||
old = orig;
|
|
||||||
|
|
||||||
for (int x=0; x < 100; ++x)
|
|
||||||
{
|
|
||||||
BOOST_CHECK_EQUAL(
|
|
||||||
! boost::xtime_get(&cur, boost::TIME_UTC_),
|
|
||||||
! static_cast<int>(boost::TIME_UTC_));
|
|
||||||
BOOST_CHECK(boost::xtime_cmp(cur, orig) >= 0);
|
|
||||||
BOOST_CHECK(boost::xtime_cmp(cur, old) >= 0);
|
|
||||||
old = cur;
|
|
||||||
diff -rc boost_1_44_0/libs/thread/test/util.inl boost_1_44_0-new/libs/thread/test/util.inl
|
|
||||||
*** boost_1_44_0/libs/thread/test/util.inl 2008-11-03 23:29:39.000000000 +0100
|
|
||||||
--- boost_1_44_0-new/libs/thread/test/util.inl 2013-04-12 14:00:19.433652665 +0200
|
|
||||||
***************
|
|
||||||
*** 28,35 ****
|
|
||||||
const int NANOSECONDS_PER_MILLISECOND = 1000000;
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
! if (boost::TIME_UTC != boost::xtime_get (&xt, boost::TIME_UTC))
|
|
||||||
! BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC");
|
|
||||||
|
|
||||||
nsecs += xt.nsec;
|
|
||||||
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
|
|
||||||
--- 28,35 ----
|
|
||||||
const int NANOSECONDS_PER_MILLISECOND = 1000000;
|
|
||||||
|
|
||||||
boost::xtime xt;
|
|
||||||
! if (boost::TIME_UTC_ != boost::xtime_get (&xt, boost::TIME_UTC))
|
|
||||||
! BOOST_ERROR ("boost::xtime_get != boost::TIME_UTC_");
|
|
||||||
|
|
||||||
nsecs += xt.nsec;
|
|
||||||
msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
|
|
||||||
@ -4811,8 +4811,6 @@ let
|
|||||||
|
|
||||||
boolstuff = callPackage ../development/libraries/boolstuff { };
|
boolstuff = callPackage ../development/libraries/boolstuff { };
|
||||||
|
|
||||||
boost144 = callPackage ../development/libraries/boost/1.44.nix { };
|
|
||||||
boost149 = callPackage ../development/libraries/boost/1.49.nix { };
|
|
||||||
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
|
boost155 = callPackage ../development/libraries/boost/1.55.nix { };
|
||||||
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
|
boost156 = callPackage ../development/libraries/boost/1.56.nix { };
|
||||||
boost = boost156;
|
boost = boost156;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user