[pkg-boost-commits] r14756 - in boost/trunk/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2013-03-22 04:27:27 +0000 (Fri, 22 Mar 2013)
New Revision: 14756

Added:
   boost/trunk/debian/patches/chrono-duration.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Fix for #703325.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2013-03-22 03:52:57 UTC (rev 14755)
+++ boost/trunk/debian/changelog	2013-03-22 04:27:27 UTC (rev 14756)
@@ -1,8 +1,12 @@
 boost1.53 (1.53.0-3) unstable; urgency=low
 
   * rules: Ensure --without-context passed during install stage, too.
+  
+  * patches/chrono-duration.patch: New.  Fix conflict between
+    chrono/duration.hpp and apache2/httpd.h (thanks, Kirill Spitsin).
+    Closes: #703325.
 
- -- Steve M. Robbins <smr at debian.org>  Thu, 21 Mar 2013 22:52:19 -0500
+ -- Steve M. Robbins <smr at debian.org>  Thu, 21 Mar 2013 23:27:01 -0500
 
 boost1.53 (1.53.0-2) unstable; urgency=low
 

Added: boost/trunk/debian/patches/chrono-duration.patch
===================================================================
--- boost/trunk/debian/patches/chrono-duration.patch	                        (rev 0)
+++ boost/trunk/debian/patches/chrono-duration.patch	2013-03-22 04:27:27 UTC (rev 14756)
@@ -0,0 +1,63 @@
+Description: Fix conflict between chrono/duration.hpp and apache2/httpd.h
+ The former defines a type named "CR" while the latter #defines CR.
+Author: Kirill Spitsin <tn at 0x746e.org.ua>
+Bug: 703325
+Forwarded: no
+
+--- boost1.53-1.53.0.obsolete.0.932490394234076.orig/boost/chrono/duration.hpp
++++ boost1.53-1.53.0.obsolete.0.932490394234076/boost/chrono/duration.hpp
+@@ -566,9 +566,9 @@
+     >::type
+     operator*(const duration<Rep1, Period>& d, const Rep2& s)
+     {
+-      typedef typename common_type<Rep1, Rep2>::type CR;
+-      typedef duration<CR, Period> CD;
+-      return CD(CD(d).count()*static_cast<CR>(s));
++      typedef typename common_type<Rep1, Rep2>::type CRRRRR;
++      typedef duration<CRRRRR, Period> CD;
++      return CD(CD(d).count()*static_cast<CRRRRR>(s));
+     }
+ 
+     template <class Rep1, class Period, class Rep2>
+@@ -595,10 +595,10 @@
+     >::type
+     operator/(const duration<Rep1, Period>& d, const Rep2& s)
+     {
+-        typedef typename common_type<Rep1, Rep2>::type CR;
+-        typedef duration<CR, Period> CD;
++        typedef typename common_type<Rep1, Rep2>::type CRRRRR;
++        typedef duration<CRRRRR, Period> CD;
+ 
+-      return CD(CD(d).count()/static_cast<CR>(s));
++      return CD(CD(d).count()/static_cast<CRRRRR>(s));
+     }
+ 
+     template <class Rep1, class Period1, class Rep2, class Period2>
+@@ -620,10 +620,10 @@
+       >::type
+     operator/(const Rep1& s, const duration<Rep2, Period>& d)
+     {
+-        typedef typename common_type<Rep1, Rep2>::type CR;
+-        typedef duration<CR, Period> CD;
++        typedef typename common_type<Rep1, Rep2>::type CRRRRR;
++        typedef duration<CRRRRR, Period> CD;
+ 
+-      return static_cast<CR>(s)/CD(d).count();
++      return static_cast<CRRRRR>(s)/CD(d).count();
+     }
+     #endif
+     // Duration %
+@@ -636,10 +636,10 @@
+     >::type
+     operator%(const duration<Rep1, Period>& d, const Rep2& s)
+     {
+-        typedef typename common_type<Rep1, Rep2>::type CR;
+-        typedef duration<CR, Period> CD;
++        typedef typename common_type<Rep1, Rep2>::type CRRRRR;
++        typedef duration<CRRRRR, Period> CD;
+ 
+-      return CD(CD(d).count()%static_cast<CR>(s));
++      return CD(CD(d).count()%static_cast<CRRRRR>(s));
+     }
+ 
+     template <class Rep1, class Period1, class Rep2, class Period2>

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2013-03-22 03:52:57 UTC (rev 14755)
+++ boost/trunk/debian/patches/series	2013-03-22 04:27:27 UTC (rev 14756)
@@ -1,3 +1,4 @@
+chrono-duration.patch
 boost-python-examples.patch
 endian.patch
 boost-1.44-py3.1.patch