summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-09-24 20:00:48 -0500
committerRuben Pollan <meskio@sindominio.net>2014-09-24 20:00:48 -0500
commit4fc0948f72c1c10f68674af59df2ba5465960fa3 (patch)
tree84bd6959606ea05534e63d6a4ac9b5ab22d53500
parente20ece7b223e0c172979c85cb8fa9b41429be812 (diff)
parenta3f95c3ca516af4146f1bdf1c95fa1e2d133033f (diff)
Merge branch 'ivanalejandro0/bug/remove-defines' into develop
-rw-r--r--src/main.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index eb709e9..e7169c2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,10 +6,8 @@
#include <unistd.h>
#include <boost/python.hpp>
-#define BOOST_NO_CXX11_SCOPED_ENUMS
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
-#undef BOOST_NO_CXX11_SCOPED_ENUMS
#include <boost/algorithm/string/predicate.hpp>
#include <frameobject.h>