Changeset 2741c88 in tol

Timestamp:

May 12, 2014, 2:19:28 PM (12 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

6601595

Parents:

747dbd9

Message:

con versiones de boost mayores de 1.47 hay que incluir boost/spirit/include/classic_

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6231 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/btol/vmatrix_type/tol_bvmat_bsr_impl.h (modified) (4 diffs)

tol/btol/vmatrix_type/tol_bvmat_bsr_impl.h

@@ -23 +23 @@
 #include <win_tolinc.h>
 #endif
+
+#include <boost/version.hpp>
 
 //#define BOOST_SPIRIT_DEBUG
@@ -43 +45 @@
 #include <iostream>
 
+#if (BOOST_VERSION / 100000 > 1) || (BOOST_VERSION / 100)> 47
+#include <boost/spirit/include/classic_core.hpp>
+#include <boost/spirit/include/classic_symbols.hpp>
+#include <boost/spirit/include/classic_actor.hpp>
+#include <boost/spirit/include/classic_exceptions.hpp>
+#include <boost/spirit/include/classic_file_iterator.hpp>
+#include <boost/spirit/include/classic_position_iterator.hpp>
+#include <boost/spirit/include/classic_utility.hpp>
+#include <boost/spirit/include/classic_stored_rule.hpp>
+#else
 #include <boost/spirit/core.hpp>
 #include <boost/spirit/symbols/symbols.hpp>
@@ -51 +63 @@
 #include <boost/spirit/utility.hpp>
 #include <boost/spirit/dynamic/stored_rule.hpp>
+#endif
 
 namespace BysSparseReg {
@@ -57 +70 @@
 ///////////////////////////////////////////////////////////////////////////////
 using namespace std;
-using namespace boost::spirit;
+using namespace boost::spirit::classic;
 ///////////////////////////////////////////////////////////////////////////////