[sdpb] 228/233: Added boost define BOOST_NO_CXX11_SCOPED_ENUMS to allow ubuntu/gcc-4.8.2 to compile

Tobias Hansen thansen at moszumanska.debian.org
Thu Mar 9 04:06:43 UTC 2017


This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository sdpb.

commit a83f39d4470488b7f4b0ef6dbcd35ee795ae6fe4
Author: root <root at peloton.cse.ucdavis.edu>
Date:   Thu Oct 27 14:52:47 2016 -0700

    Added boost define BOOST_NO_CXX11_SCOPED_ENUMS to allow ubuntu/gcc-4.8.2 to compile
---
 src/SDPSolver.cpp   | 5 ++++-
 src/SDPSolver.h     | 5 ++++-
 src/SDPSolverIO.cpp | 5 ++++-
 src/main.cpp        | 5 ++++-
 src/parse.h         | 5 ++++-
 src/serialize.h     | 5 ++++-
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/SDPSolver.cpp b/src/SDPSolver.cpp
index 0098da4..2f11f4b 100644
--- a/src/SDPSolver.cpp
+++ b/src/SDPSolver.cpp
@@ -10,7 +10,10 @@
 #include <iostream>
 #include <vector>
 #include "omp.h"
-#include "boost/filesystem.hpp"
+//Tweak to allow Ubuntu-14.04/gcc-4.8.4 and similar environments to compile
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#include <boost/filesystem.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include "SDPSolver.h"
 #include "Timers.h"
 
diff --git a/src/SDPSolver.h b/src/SDPSolver.h
index 65dcc22..0e40110 100644
--- a/src/SDPSolver.h
+++ b/src/SDPSolver.h
@@ -12,7 +12,10 @@
 #include <iostream>
 #include <ostream>
 #include <vector>
-#include "boost/filesystem.hpp"
+//Tweak to allow Ubuntu-14.04/gcc-4.8.4 and similar environments to compile
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#include <boost/filesystem.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include "types.h"
 #include "Vector.h"
 #include "Matrix.h"
diff --git a/src/SDPSolverIO.cpp b/src/SDPSolverIO.cpp
index 45dbe12..8a8ef7c 100644
--- a/src/SDPSolverIO.cpp
+++ b/src/SDPSolverIO.cpp
@@ -12,7 +12,10 @@
 #include "omp.h"
 #include "boost/archive/text_oarchive.hpp"
 #include "boost/archive/text_iarchive.hpp"
-#include "boost/filesystem.hpp"
+//Tweak to allow Ubuntu-14.04/gcc-4.8.4 and similar environments to compile
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#include <boost/filesystem.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include "boost/filesystem/fstream.hpp"
 #include "boost/date_time/posix_time/posix_time.hpp"
 #include "SDPSolver.h"
diff --git a/src/main.cpp b/src/main.cpp
index 65350d0..489616d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -13,7 +13,10 @@
 #include <ostream>
 #include <string>
 #include "omp.h"
-#include "boost/filesystem.hpp"
+//Tweak to allow Ubuntu-14.04/gcc-4.8.4 and similar environments to compile
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#include <boost/filesystem.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include "boost/date_time/posix_time/posix_time.hpp"
 #include "boost/program_options.hpp"
 #include "types.h"
diff --git a/src/parse.h b/src/parse.h
index 4d79b8a..2bc9a4f 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -9,7 +9,10 @@
 #ifndef SDPB_PARSE_H_
 #define SDPB_PARSE_H_
 
-#include "boost/filesystem.hpp"
+//Tweak to allow Ubuntu-14.04/gcc-4.8.4 and similar environments to compile
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#include <boost/filesystem.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include "SDP.h"
 
 using boost::filesystem::path;
diff --git a/src/serialize.h b/src/serialize.h
index d94abf7..e808cb8 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -20,7 +20,10 @@
 #include "boost/serialization/split_free.hpp"
 #include "boost/archive/text_iarchive.hpp"
 #include "boost/archive/text_oarchive.hpp"
-#include "boost/filesystem.hpp"
+//Tweak to allow Ubuntu-14.04/gcc-4.8.4 and similar environments to compile
+#define BOOST_NO_CXX11_SCOPED_ENUMS
+#include <boost/filesystem.hpp>
+#undef BOOST_NO_CXX11_SCOPED_ENUMS
 #include "boost/filesystem/fstream.hpp"
 #include "types.h"
 #include "Vector.h"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdpb.git



More information about the debian-science-commits mailing list