[pkg-boost-commits] r14764 - in boost/branches/1.49.0/debian: . patches
Steven Michael Robbins
smr at alioth.debian.org
Tue May 14 05:06:17 UTC 2013
Author: smr
Date: 2013-05-14 05:06:17 +0000 (Tue, 14 May 2013)
New Revision: 14764
Added:
boost/branches/1.49.0/debian/patches/changeset_78679.diff
boost/branches/1.49.0/debian/patches/changeset_80894.diff
boost/branches/1.49.0/debian/patches/thread-xtime.patch
Modified:
boost/branches/1.49.0/debian/changelog
boost/branches/1.49.0/debian/patches/series
Log:
Three new patches.
Modified: boost/branches/1.49.0/debian/changelog
===================================================================
--- boost/branches/1.49.0/debian/changelog 2013-05-14 04:23:34 UTC (rev 14763)
+++ boost/branches/1.49.0/debian/changelog 2013-05-14 05:06:17 UTC (rev 14764)
@@ -1,3 +1,14 @@
+boost1.49 (1.49.0-4) unstable; urgency=low
+
+ * patches/thread-xtime.patch: New. Fix build failures due to enum value
+ TIME_UTC. Closes: #707389, 707540, 695826, 701377, 703980.
+ * patches/changeset_78679.diff: New. Fix compile of read_json.
+ Closes: #689600.
+ * patches/changeset_80894.diff: New. Fix boost::unordered_multimap.
+ Closes: #692868
+
+ -- Steve M. Robbins <smr at debian.org> Tue, 14 May 2013 00:05:57 -0500
+
boost1.49 (1.49.0-3.2) unstable; urgency=high
* Non-maintainer upload by the Security Team..
Added: boost/branches/1.49.0/debian/patches/changeset_78679.diff
===================================================================
--- boost/branches/1.49.0/debian/patches/changeset_78679.diff (rev 0)
+++ boost/branches/1.49.0/debian/patches/changeset_78679.diff 2013-05-14 05:06:17 UTC (rev 14764)
@@ -0,0 +1,41 @@
+Description: Fix read_json to compile with c++11
+ Upstream Changeset 78679
+Author: cornedbee
+Bug: 689600
+Forwarded: https://svn.boost.org/trac/boost/ticket/6785
+
+
+Index: /branches/release/boost/property_tree/detail/json_parser_read.hpp
+===================================================================
+--- /branches/release/boost/property_tree/detail/json_parser_read.hpp (revision 71991)
++++ /branches/release/boost/property_tree/detail/json_parser_read.hpp (revision 78679)
+@@ -103,5 +103,6 @@
+ {
+ BOOST_ASSERT(c.stack.size() >= 1);
+- c.stack.back()->push_back(std::make_pair(c.name, Str(b, e)));
++ c.stack.back()->push_back(std::make_pair(c.name,
++ Ptree(Str(b, e))));
+ c.name.clear();
+ c.string.clear();
+Index: /branches/release/boost/property_tree/detail/ptree_implementation.hpp
+===================================================================
+--- /branches/release/boost/property_tree/detail/ptree_implementation.hpp (revision 76447)
++++ /branches/release/boost/property_tree/detail/ptree_implementation.hpp (revision 78679)
+@@ -390,5 +390,5 @@
+ bool operator ()(const P& lhs, const P& rhs) const {
+ return lhs.first < rhs.first;
+- };
++ }
+ };
+ }
+Index: /branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp
+===================================================================
+--- /branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp (revision 65976)
++++ /branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp (revision 78679)
+@@ -16,5 +16,5 @@
+ #define BOOST_UTF8_DECL
+ #include <boost/detail/utf8_codecvt_facet.hpp>
+-#include "../../detail/utf8_codecvt_facet.cpp"
++#include <boost/detail/utf8_codecvt_facet.ipp>
+
+ int test_main(int argc, char *argv[])
Added: boost/branches/1.49.0/debian/patches/changeset_80894.diff
===================================================================
--- boost/branches/1.49.0/debian/patches/changeset_80894.diff (rev 0)
+++ boost/branches/1.49.0/debian/patches/changeset_80894.diff 2013-05-14 05:06:17 UTC (rev 14764)
@@ -0,0 +1,225 @@
+Description: Fix crash in unordered_multimap::erase(iterator, iterator) function
+ Upstream Changeset 80894
+Author: danieljames
+Bug: 692868
+Forwarded: https://svn.boost.org/trac/boost/ticket/7471
+
+Index: /trunk/boost/unordered/detail/equivalent.hpp
+===================================================================
+--- /trunk/boost/unordered/detail/equivalent.hpp (revision 80561)
++++ /trunk/boost/unordered/detail/equivalent.hpp (revision 80894)
+@@ -677,7 +677,7 @@
+ if(begin == group2) {
+ link_pointer end1 = group1->group_prev_;
+- link_pointer end2 = group2->group_prev_;
++ link_pointer end2 = end->group_prev_;
+ group1->group_prev_ = end2;
+- group2->group_prev_ = end1;
++ end->group_prev_ = end1;
+ }
+ }
+Index: /trunk/boost/unordered/detail/table.hpp
+===================================================================
+--- /trunk/boost/unordered/detail/table.hpp (revision 80562)
++++ /trunk/boost/unordered/detail/table.hpp (revision 80894)
+@@ -619,5 +619,14 @@
+ for(;;) {
+ n = static_cast<node_pointer>(n->next_);
+- if (n == end) return;
++ if (n == end) {
++ if (n) {
++ std::size_t new_bucket_index =
++ policy::to_bucket(bucket_count_, n->hash_);
++ if (bucket_index != new_bucket_index) {
++ get_bucket(new_bucket_index)->next_ = prev;
++ }
++ }
++ return;
++ }
+
+ std::size_t new_bucket_index =
+Index: /trunk/libs/unordered/test/unordered/erase_tests.cpp
+===================================================================
+--- /trunk/libs/unordered/test/unordered/erase_tests.cpp (revision 80416)
++++ /trunk/libs/unordered/test/unordered/erase_tests.cpp (revision 80894)
+@@ -16,4 +16,5 @@
+ #include "../helpers/equivalent.hpp"
+ #include "../helpers/helpers.hpp"
++#include "../helpers/invariants.hpp"
+
+ #include <iostream>
+@@ -33,4 +34,5 @@
+ test::random_values<Container> v(1000, generator);
+ Container x(v.begin(), v.end());
++ int iterations = 0;
+ for(BOOST_DEDUCED_TYPENAME test::random_values<Container>::iterator
+ it = v.begin(); it != v.end(); ++it)
+@@ -42,4 +44,5 @@
+ BOOST_TEST(x.count(test::get_key<Container>(*it)) == 0);
+ BOOST_TEST(x.find(test::get_key<Container>(*it)) == x.end());
++ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
+ }
+ }
+@@ -52,4 +55,5 @@
+ Container x(v.begin(), v.end());
+ std::size_t size = x.size();
++ int iterations = 0;
+ while(size > 0 && !x.empty())
+ {
+@@ -63,4 +67,5 @@
+ BOOST_TEST(x.count(key) == count - 1);
+ BOOST_TEST(x.size() == size);
++ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
+ }
+ BOOST_TEST(x.empty());
+@@ -74,4 +79,5 @@
+ Container x(v.begin(), v.end());
+ std::size_t size = x.size();
++ int iterations = 0;
+ while(size > 0 && !x.empty())
+ {
+@@ -97,4 +103,5 @@
+ BOOST_TEST(x.count(key) == count - 1);
+ BOOST_TEST(x.size() == size);
++ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
+ }
+ BOOST_TEST(x.empty());
+@@ -117,10 +124,13 @@
+ BOOST_TEST(x.erase(x.begin(), x.begin()) == x.begin());
+ BOOST_TEST(x.size() == size);
++ test::check_equivalent_keys(x);
+
+ BOOST_TEST(x.erase(x.begin(), x.end()) == x.end());
+ BOOST_TEST(x.empty());
+ BOOST_TEST(x.begin() == x.end());
++ test::check_equivalent_keys(x);
+
+ BOOST_TEST(x.erase(x.begin(), x.end()) == x.begin());
++ test::check_equivalent_keys(x);
+ }
+
+@@ -132,4 +142,5 @@
+ Container x(v.begin(), v.end());
+ std::size_t size = x.size();
++ int iterations = 0;
+ while(size > 0 && !x.empty())
+ {
+@@ -141,4 +152,5 @@
+ BOOST_TEST(x.count(key) == count - 1);
+ BOOST_TEST(x.size() == size);
++ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
+ }
+ BOOST_TEST(x.empty());
+@@ -152,4 +164,5 @@
+ Container x(v.begin(), v.end());
+ std::size_t size = x.size();
++ int iterations = 0;
+ while(size > 0 && !x.empty())
+ {
+@@ -175,4 +188,5 @@
+ BOOST_TEST(x.count(key) == count - 1);
+ BOOST_TEST(x.size() == size);
++ if (++iterations % 20 == 0) test::check_equivalent_keys(x);
+ }
+ BOOST_TEST(x.empty());
+Index: /trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp
+===================================================================
+--- /trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp (revision 79357)
++++ /trunk/libs/unordered/test/unordered/erase_equiv_tests.cpp (revision 80894)
+@@ -13,4 +13,5 @@
+ #include "../helpers/test.hpp"
+ #include "../helpers/list.hpp"
++#include "../helpers/invariants.hpp"
+ #include <set>
+ #include <iostream>
+@@ -50,4 +51,10 @@
+ {
+ int operator()(int x) const { return x & 1; }
++};
++
++// For testing erase in lots of buckets.
++struct collision3_hash
++{
++ int operator()(int x) const { return x; }
+ };
+
+@@ -58,4 +65,7 @@
+ collision2_hash, std::equal_to<int>,
+ test::allocator2<std::pair<int const, int> > > collide_map2;
++typedef boost::unordered_multimap<int, int,
++ collision3_hash, std::equal_to<int>,
++ test::allocator2<std::pair<int const, int> > > collide_map3;
+ typedef collide_map::value_type collide_value;
+ typedef test::list<collide_value> collide_list;
+@@ -67,4 +77,5 @@
+ x.erase(x.begin(), x.begin());
+ x.erase(x.end(), x.end());
++ test::check_equivalent_keys(x);
+ }
+
+@@ -77,8 +88,11 @@
+ x.erase(x.begin(), x.begin());
+ BOOST_TEST(x.count(1) == 1 && x.size() == 1);
++ test::check_equivalent_keys(x);
+ x.erase(x.end(), x.end());
+ BOOST_TEST(x.count(1) == 1 && x.size() == 1);
++ test::check_equivalent_keys(x);
+ x.erase(x.begin(), x.end());
+ BOOST_TEST(x.count(1) == 0 && x.size() == 0);
++ test::check_equivalent_keys(x);
+ }
+
+@@ -93,4 +107,5 @@
+ x.erase(x.begin(), x.end());
+ BOOST_TEST(x.count(1) == 0 && x.size() == 0);
++ test::check_equivalent_keys(x);
+ }
+
+@@ -101,4 +116,5 @@
+ BOOST_TEST(x.count(1) == 1 && x.size() == 1 &&
+ x.begin()->first == 1 && x.begin()->second == value);
++ test::check_equivalent_keys(x);
+ }
+
+@@ -109,4 +125,5 @@
+ BOOST_TEST(x.count(1) == 1 && x.size() == 1 &&
+ x.begin()->first == 1 && x.begin()->second == value);
++ test::check_equivalent_keys(x);
+ }
+ }
+@@ -130,4 +147,6 @@
+ l.erase(boost::next(l.begin(), start), boost::next(l.begin(), end));
+ x.erase(boost::next(x.begin(), start), boost::next(x.begin(), end));
++
++ test::check_equivalent_keys(x);
+ return compare(l, x);
+ }
+@@ -192,3 +211,10 @@
+ }
+
++UNORDERED_AUTO_TEST(exhaustive_collide3_tests)
++{
++ std::cout<<"exhaustive_collide3_tests:\n";
++ exhaustive_erase_tests((collide_map3*) 0, 8, 4);
++ std::cout<<"\n";
++}
++
+ RUN_TESTS()
+Index: /trunk/libs/unordered/doc/changes.qbk
+===================================================================
+--- /trunk/libs/unordered/doc/changes.qbk (revision 80776)
++++ /trunk/libs/unordered/doc/changes.qbk (revision 80894)
+@@ -3,4 +3,7 @@
+ / 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) ]
++
++[template ticket[number]'''<ulink
++ url="https://svn.boost.org/trac/boost/ticket/'''[number]'''">'''#[number]'''</ulink>''']
+
+ [section:changes Change Log]
+@@ -212,4 +215,5 @@
+ * Faster assign, which assigns to existing nodes where possible, rather than
+ creating entirely new nodes and copy constructing.
++* Fixed bug in `erase_range` ([ticket 7471]).
+ * Reverted some of the internal changes to how nodes are created, especially
+ for C++11 compilers. 'construct' and 'destroy' should work a little better
Modified: boost/branches/1.49.0/debian/patches/series
===================================================================
--- boost/branches/1.49.0/debian/patches/series 2013-05-14 04:23:34 UTC (rev 14763)
+++ boost/branches/1.49.0/debian/patches/series 2013-05-14 05:06:17 UTC (rev 14764)
@@ -1,3 +1,6 @@
+thread-xtime.patch
+changeset_78679.diff
+changeset_80894.diff
boost-python-examples.patch
endian.patch
boost-1.44-py3.1.patch
Added: boost/branches/1.49.0/debian/patches/thread-xtime.patch
===================================================================
--- boost/branches/1.49.0/debian/patches/thread-xtime.patch (rev 0)
+++ boost/branches/1.49.0/debian/patches/thread-xtime.patch 2013-05-14 05:06:17 UTC (rev 14764)
@@ -0,0 +1,326 @@
+Description: Rename enum value TIME_UTC --> TIME_UTC_
+ Avoids clash with C11 constant of the same name.
+Author: Steve Robbins
+Bug:
+Forwarded: https://svn.boost.org/trac/boost/ticket/6940
+
+
+diff -u '--exclude=debian' -r boost-orig/boost/thread/xtime.hpp boost1.49-1.49.0/boost/thread/xtime.hpp
+--- boost-orig/boost/thread/xtime.hpp 2008-06-18 08:01:08.000000000 -0500
++++ boost1.49-1.49.0/boost/thread/xtime.hpp 2013-05-13 23:31:31.394700775 -0500
+@@ -20,7 +20,7 @@
+
+ enum xtime_clock_types
+ {
+- TIME_UTC=1
++ TIME_UTC_=1
+ // TIME_TAI,
+ // TIME_MONOTONIC,
+ // TIME_PROCESS,
+@@ -68,7 +68,7 @@
+
+ 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;
+diff -u '--exclude=debian' -r boost-orig/libs/container/test/util.hpp boost1.49-1.49.0/libs/container/test/util.hpp
+--- boost-orig/libs/container/test/util.hpp 2011-08-26 13:26:44.000000000 -0500
++++ boost1.49-1.49.0/libs/container/test/util.hpp 2013-05-13 23:31:31.394700775 -0500
+@@ -71,7 +71,7 @@
+ boost::xtime xsecs(int secs)
+ {
+ boost::xtime ret;
+- boost::xtime_get(&ret, boost::TIME_UTC);
++ boost::xtime_get(&ret, boost::TIME_UTC_);
+ ret.sec += secs;
+ return ret;
+ }
+diff -u '--exclude=debian' -r boost-orig/libs/interprocess/test/condition_test_template.hpp boost1.49-1.49.0/libs/interprocess/test/condition_test_template.hpp
+--- boost-orig/libs/interprocess/test/condition_test_template.hpp 2011-12-26 11:39:43.000000000 -0600
++++ boost1.49-1.49.0/libs/interprocess/test/condition_test_template.hpp 2013-05-13 23:31:31.406700946 -0500
+@@ -47,8 +47,8 @@
+ const int NANOSECONDS_PER_MILLISECOND = 1000000;
+
+ boost::xtime xt;
+- int ret = boost::xtime_get(&xt, boost::TIME_UTC);
+- BOOST_INTERPROCES_CHECK(ret == static_cast<int>(boost::TIME_UTC));(void)ret;
++ int ret = boost::xtime_get(&xt, boost::TIME_UTC_);
++ BOOST_INTERPROCES_CHECK(ret == static_cast<int>(boost::TIME_UTC_));(void)ret;
+ nsecs += xt.nsec;
+ msecs += nsecs / NANOSECONDS_PER_MILLISECOND;
+ secs += msecs / MILLISECONDS_PER_SECOND;
+diff -u '--exclude=debian' -r boost-orig/libs/interprocess/test/util.hpp boost1.49-1.49.0/libs/interprocess/test/util.hpp
+--- boost-orig/libs/interprocess/test/util.hpp 2011-12-26 11:39:43.000000000 -0600
++++ boost1.49-1.49.0/libs/interprocess/test/util.hpp 2013-05-13 23:31:31.410701004 -0500
+@@ -63,7 +63,7 @@
+ boost::xtime xsecs(int secs)
+ {
+ boost::xtime ret;
+- boost::xtime_get(&ret, boost::TIME_UTC);
++ boost::xtime_get(&ret, boost::TIME_UTC_);
+ ret.sec += secs;
+ return ret;
+ }
+diff -u '--exclude=debian' -r boost-orig/libs/spirit/classic/test/grammar_mt_tests.cpp boost1.49-1.49.0/libs/spirit/classic/test/grammar_mt_tests.cpp
+--- boost-orig/libs/spirit/classic/test/grammar_mt_tests.cpp 2008-06-22 10:05:38.000000000 -0500
++++ boost1.49-1.49.0/libs/spirit/classic/test/grammar_mt_tests.cpp 2013-05-13 23:31:31.394700775 -0500
+@@ -70,7 +70,7 @@
+ {
+ static long const nanoseconds_per_second = 1000L*1000L*1000L;
+ boost::xtime xt;
+- boost::xtime_get(&xt, boost::TIME_UTC);
++ boost::xtime_get(&xt, boost::TIME_UTC_);
+ xt.nsec+=1000*1000*milliseconds;
+ while (xt.nsec > nanoseconds_per_second)
+ {
+diff -u '--exclude=debian' -r boost-orig/libs/spirit/classic/test/owi_mt_tests.cpp boost1.49-1.49.0/libs/spirit/classic/test/owi_mt_tests.cpp
+--- boost-orig/libs/spirit/classic/test/owi_mt_tests.cpp 2008-06-22 10:05:38.000000000 -0500
++++ boost1.49-1.49.0/libs/spirit/classic/test/owi_mt_tests.cpp 2013-05-13 23:31:31.394700775 -0500
+@@ -86,7 +86,7 @@
+ return test_size;
+
+ boost::xtime now;
+- boost::xtime_get(&now, boost::TIME_UTC);
++ boost::xtime_get(&now, boost::TIME_UTC_);
+ unsigned long seconds = now.sec - start_time.sec;
+ if (seconds < 4)
+ {
+@@ -187,7 +187,7 @@
+ void concurrent_creation_of_objects()
+ {
+ {
+- boost::xtime_get(&start_time, boost::TIME_UTC);
++ 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 -u '--exclude=debian' -r boost-orig/libs/thread/example/starvephil.cpp boost1.49-1.49.0/libs/thread/example/starvephil.cpp
+--- boost-orig/libs/thread/example/starvephil.cpp 2006-09-14 16:51:01.000000000 -0500
++++ boost1.49-1.49.0/libs/thread/example/starvephil.cpp 2013-05-13 23:31:31.406700946 -0500
+@@ -50,7 +50,7 @@
+ << "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 @@
+ 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 @@
+ 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);
+ }
+diff -u '--exclude=debian' -r boost-orig/libs/thread/example/tennis.cpp boost1.49-1.49.0/libs/thread/example/tennis.cpp
+--- boost-orig/libs/thread/example/tennis.cpp 2009-10-19 04:18:13.000000000 -0500
++++ boost1.49-1.49.0/libs/thread/example/tennis.cpp 2013-05-13 23:31:31.402700889 -0500
+@@ -104,7 +104,7 @@
+ 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);
+ {
+diff -u '--exclude=debian' -r boost-orig/libs/thread/example/thread.cpp boost1.49-1.49.0/libs/thread/example/thread.cpp
+--- boost-orig/libs/thread/example/thread.cpp 2006-09-14 16:51:01.000000000 -0500
++++ boost1.49-1.49.0/libs/thread/example/thread.cpp 2013-05-13 23:31:31.406700946 -0500
+@@ -14,7 +14,7 @@
+ 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);
+diff -u '--exclude=debian' -r boost-orig/libs/thread/example/xtime.cpp boost1.49-1.49.0/libs/thread/example/xtime.cpp
+--- boost-orig/libs/thread/example/xtime.cpp 2006-09-14 16:51:01.000000000 -0500
++++ boost1.49-1.49.0/libs/thread/example/xtime.cpp 2013-05-13 23:31:31.406700946 -0500
+@@ -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
+ }
+diff -u '--exclude=debian' -r boost-orig/libs/thread/src/pthread/thread.cpp boost1.49-1.49.0/libs/thread/src/pthread/thread.cpp
+--- boost-orig/libs/thread/src/pthread/thread.cpp 2012-01-03 11:31:50.000000000 -0600
++++ boost1.49-1.49.0/libs/thread/src/pthread/thread.cpp 2013-05-13 23:31:31.398700832 -0500
+@@ -354,7 +354,7 @@
+ 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 @@
+ BOOST_VERIFY(!pthread_yield());
+ # else
+ xtime xt;
+- xtime_get(&xt, TIME_UTC);
++ xtime_get(&xt, TIME_UTC_);
+ sleep(xt);
+ # endif
+ }
+diff -u '--exclude=debian' -r boost-orig/libs/thread/src/pthread/timeconv.inl boost1.49-1.49.0/libs/thread/src/pthread/timeconv.inl
+--- boost-orig/libs/thread/src/pthread/timeconv.inl 2012-01-03 11:31:50.000000000 -0600
++++ boost1.49-1.49.0/libs/thread/src/pthread/timeconv.inl 2013-05-13 23:31:31.398700832 -0500
+@@ -20,8 +20,8 @@
+ 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 @@
+ {
+ 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 @@
+ {
+ 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 @@
+ {
+ 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;
+diff -u '--exclude=debian' -r boost-orig/libs/thread/src/win32/timeconv.inl boost1.49-1.49.0/libs/thread/src/win32/timeconv.inl
+--- boost-orig/libs/thread/src/win32/timeconv.inl 2007-11-25 12:38:02.000000000 -0600
++++ boost1.49-1.49.0/libs/thread/src/win32/timeconv.inl 2013-05-13 23:31:31.398700832 -0500
+@@ -17,8 +17,8 @@
+ 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 @@
+ {
+ 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 @@
+ {
+ 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 @@
+ {
+ 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;
+diff -u '--exclude=debian' -r boost-orig/libs/thread/test/test_xtime.cpp boost1.49-1.49.0/libs/thread/test/test_xtime.cpp
+--- boost-orig/libs/thread/test/test_xtime.cpp 2012-01-03 11:31:50.000000000 -0600
++++ boost1.49-1.49.0/libs/thread/test/test_xtime.cpp 2013-05-13 23:31:31.402700889 -0500
+@@ -17,8 +17,8 @@
+ {
+ 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 @@
+ 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;
+diff -u '--exclude=debian' -r boost-orig/libs/thread/test/util.inl boost1.49-1.49.0/libs/thread/test/util.inl
+--- boost-orig/libs/thread/test/util.inl 2008-11-03 16:29:39.000000000 -0600
++++ boost1.49-1.49.0/libs/thread/test/util.inl 2013-05-13 23:31:31.398700832 -0500
+@@ -28,8 +28,8 @@
+ 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;
More information about the pkg-boost-commits
mailing list