Commit 54a6908a authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[CHANGE] Made OpenWalnut Boost 1.46.1 ready, by using BOOST_FILESYSTEM_VERSION 2.

parent 0d9c1d2f
......@@ -26,6 +26,8 @@
#include <streambuf>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include "exceptions/WFileNotFound.h"
......
......@@ -28,9 +28,10 @@
#include <stdint.h>
#include <algorithm>
// #include <cstdio>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include "WExportCommon.h"
......
......@@ -27,10 +27,13 @@
#include <vector>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
#include "WExportCommon.h"
/**
* Singleton class helping to find files and paths. It is a useful to to search for resources and the central place to "hardcode" relative paths.
* It contains global paths only. Modules have their OWN local paths.
......
......@@ -28,6 +28,8 @@
#include <string>
#include <fstream>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/program_options.hpp>
......
......@@ -25,12 +25,13 @@
#include <list>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include "exceptions/WPropertyNameMalformed.h"
#include "WPropertyBase.h"
#include "WProperties.h"
#include "WPropertyBase.h"
#include "WPropertyVariable.h"
WPropertyBase::WPropertyBase( std::string name, std::string description ):
......
......@@ -27,17 +27,19 @@
#include <stdint.h>
#include <string>
#include <list>
#include <string>
#include <utility>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/lexical_cast.hpp>
#include "math/WPosition.h"
#include "math/WMatrix4x4.h"
#include "WItemSelector.h"
#include "math/WPosition.h"
#include "WColor.h"
#include "WItemSelector.h"
template < typename T >
class WPropertyVariable;
......
......@@ -28,34 +28,32 @@
#include <stdint.h>
#include <iostream>
#include <string>
#include <list>
#include <vector>
#include <set>
#include <string>
#include <vector>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/thread.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/thread.hpp>
#include "WLogger.h"
#include "constraints/WPropertyConstraintIsDirectory.h"
#include "constraints/WPropertyConstraintMax.h"
#include "constraints/WPropertyConstraintMin.h"
#include "constraints/WPropertyConstraintNotEmpty.h"
#include "constraints/WPropertyConstraintPathExists.h"
#include "constraints/WPropertyConstraintSelectOnlyOne.h"
#include "constraints/WPropertyConstraintTypes.h"
#include "WCondition.h"
#include "WFlag.h"
#include "WLogger.h"
#include "WPropertyBase.h"
#include "WCondition.h"
#include "WSharedAssociativeContainer.h"
#include "WSharedObjectTicketRead.h"
#include "WSharedObjectTicketWrite.h"
#include "constraints/WPropertyConstraintTypes.h"
#include "constraints/WPropertyConstraintMin.h"
#include "constraints/WPropertyConstraintMax.h"
#include "constraints/WPropertyConstraintNotEmpty.h"
#include "constraints/WPropertyConstraintPathExists.h"
#include "constraints/WPropertyConstraintIsDirectory.h"
#include "constraints/WPropertyConstraintSelectOnlyOne.h"
/**
* A named property class with a concrete type.
*/
......
......@@ -26,14 +26,17 @@
#include <cassert>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#ifdef _WIN32
#include <iostream>
#include <windows.h> // NOLINT
#include <iostream>
#include <windows.h> // NOLINT
#endif
#include "exceptions/WLibraryFetchFailed.h"
#include "exceptions/WLibraryLoadFailed.h"
#include "WSharedLib.h"
#ifdef _WIN32
......
......@@ -28,6 +28,8 @@
#include <algorithm>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include "WExportCommon.h"
......
......@@ -28,6 +28,8 @@
#include <utility>
#include <vector>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem/fstream.hpp>
#include <boost/lexical_cast.hpp>
......
......@@ -24,6 +24,8 @@
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include "../../common/WIOTools.h"
......
......@@ -25,6 +25,8 @@
#include <fstream>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
......
......@@ -27,6 +27,8 @@
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
......
......@@ -25,6 +25,8 @@
#include <fstream>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
......
......@@ -27,6 +27,8 @@
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/shared_ptr.hpp>
......
......@@ -32,18 +32,18 @@
#include <boost/shared_ptr.hpp>
#include <boost/thread/locks.hpp>
#include <osg/ref_ptr>
#include <osg/Vec3>
#include <osg/Vec4>
#include <osg/ref_ptr>
#include <osgViewer/CompositeViewer>
#include <osgViewer/View>
#include <osgViewer/Viewer>
#include "../../common/math/WPosition.h"
#include "../../common/WColor.h"
#include "../../common/WLogger.h"
#include "../../common/WPathHelper.h"
#include "../../common/WPreferences.h"
#include "../../common/math/WPosition.h"
#include "../exceptions/WGEInitFailed.h"
#include "../exceptions/WGESignalSubscriptionFailed.h"
#include "WGEViewerMac.h"
......
......@@ -23,29 +23,30 @@
//---------------------------------------------------------------------------
#include <map>
#include <string>
#include <sstream>
#include <ostream>
#include <sstream>
#include <string>
#include <boost/algorithm/string.hpp>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/function.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/tokenizer.hpp>
#include <boost/regex.hpp>
#include <boost/signals2/signal.hpp>
#include <boost/function.hpp>
#include <boost/tokenizer.hpp>
#include <osg/StateSet>
#include <osg/Node>
#include <osg/StateSet>
#include "../WGraphicsEngine.h"
#include "WGEShaderPreprocessor.h"
#include "WGEShaderVersionPreprocessor.h"
#include "../../common/WLogger.h"
#include "../../common/WPathHelper.h"
#include "../../common/WPredicateHelper.h"
#include "../WGraphicsEngine.h"
#include "WGEShader.h"
#include "WGEShaderPreprocessor.h"
#include "WGEShaderVersionPreprocessor.h"
WGEShader::WGEShader( std::string name, boost::filesystem::path search ):
osg::Program(),
......
......@@ -25,22 +25,24 @@
#ifndef WGESHADER_H
#define WGESHADER_H
#include <map>
#include <list>
#include <map>
#include <string>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/signals2/signal.hpp>
#include <osg/Shader>
#include <osg/Program>
#include <osg/NodeCallback>
#include <osg/Program>
#include <osg/Shader>
#include "../../common/WPathHelper.h"
#include "../../common/WSharedAssociativeContainer.h"
#include "WGEShaderPreprocessor.h"
#include "WGEShaderDefine.h"
#include "../WExportWGE.h"
#include "WGEShaderDefine.h"
#include "WGEShaderPreprocessor.h"
/**
* Class encapsulating the OSG Program class for a more convenient way of adding and modifying shader.
......
......@@ -27,6 +27,8 @@
#include <string>
#include <vector>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/program_options.hpp>
#include <boost/shared_ptr.hpp>
......
......@@ -23,11 +23,11 @@
//---------------------------------------------------------------------------
#ifdef __linux__
#include <unistd.h> // used for getcwd (to get current directory)
#include <unistd.h> // used for getcwd (to get current directory)
#endif
#if defined(__APPLE__)
#include <mach-o/dyld.h>
#include <mach-o/dyld.h>
#endif
#include <iostream>
......@@ -35,6 +35,8 @@
#include <string>
#include <vector>
// Boost 1.46 uses boost::filesystem3 as new default API, inorder to support old boost versions we still use the old API
#define BOOST_FILESYSTEM_VERSION 2
#include <boost/filesystem.hpp>
#include <boost/thread/xtime.hpp>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment