Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (e0966e0fed7f4c0e72820d7029b9178ef64afd88)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Bor Kraljič <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (e0966e0fed7f4c0e72820d7029b9178ef64afd88)
  • Date: Thu, 18 Aug 2011 04:30:47 -0500

GIT changes to devel-kde47 grimoire by Bor Kraljič <pyrobor AT ver.si>:

libs/boost/HISTORY | 4 ++++
libs/boost/PRE_BUILD | 5 ++++-
libs/boost/converter_policies_hpp.patch | 24 ++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit e0966e0fed7f4c0e72820d7029b9178ef64afd88
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Bor Kraljič <pyrobor AT ver.si>

boost: added patch converter_policies_hpp.patch so rocs compiles without
an error

diff --git a/libs/boost/HISTORY b/libs/boost/HISTORY
index 2d1d40b..e1caed0 100644
--- a/libs/boost/HISTORY
+++ b/libs/boost/HISTORY
@@ -1,3 +1,7 @@
+2011-08-18 Bor Kraljič <pyrobor AT ver.si>
+ * PRE_BUILD: added patch converter_policies_hpp.patch so rocs
compiles without an error
+ (patch taken from https://svn.boost.org/trac/boost/ticket/5076 )
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/libs/boost/PRE_BUILD b/libs/boost/PRE_BUILD
index 5950e2c..ff9a3f2 100755
--- a/libs/boost/PRE_BUILD
+++ b/libs/boost/PRE_BUILD
@@ -1,4 +1,7 @@
default_pre_build &&
message "${MESSAGE_COLOR}Allow providing our own
CXXFLAGS...${DEFAULT_COLOR}" &&
patch $SOURCE_DIRECTORY/tools/build/v2/tools/gcc.jam \
- $SCRIPT_DIRECTORY/boost-use-cxxflags.patch
+ $SCRIPT_DIRECTORY/boost-use-cxxflags.patch &&
+patch -p1 -d $SOURCE_DIRECTORY <
$SCRIPT_DIRECTORY/converter_policies_hpp.patch &&
+message "patching done"
+
diff --git a/libs/boost/converter_policies_hpp.patch
b/libs/boost/converter_policies_hpp.patch
new file mode 100644
index 0000000..4065b21
--- /dev/null
+++ b/libs/boost/converter_policies_hpp.patch
@@ -0,0 +1,24 @@
+--- 1.1/boost/numeric/conversion/converter_policies.hpp 2009-07-13
14:41:34 +01:00
++++ edited/boost/numeric/conversion/converter_policies.hpp 2011-01-14
12:06:18 +00:00
+@@ -21,6 +21,8 @@
+ #include "boost/mpl/if.hpp"
+ #include "boost/mpl/integral_c.hpp"
+
++#include "boost/throw_exception.hpp"
++
+ namespace boost { namespace numeric
+ {
+
+@@ -159,9 +161,9 @@
+ void operator() ( range_check_result r ) //
throw(negative_overflow,positive_overflow)
+ {
+ if ( r == cNegOverflow )
+- throw negative_overflow() ;
++ boost::throw_exception(negative_overflow()) ;
+ else if ( r == cPosOverflow )
+- throw positive_overflow() ;
++ boost::throw_exception(positive_overflow()) ;
+ }
+ } ;
+
+



  • [SM-Commit] GIT changes to devel-kde47 grimoire by Bor Kraljič (e0966e0fed7f4c0e72820d7029b9178ef64afd88), Bor Kraljič, 08/18/2011

Archive powered by MHonArc 2.6.24.

Top of Page