[esteid] r4006 committed - esteid-browser-plugin: Use boost filesystem v3...

[est...@googlecode.com]

Revision: 4006
Author: kalevlember
Date: Wed Jul 18 05:56:03 2012
Log: esteid-browser-plugin: Use boost filesystem v3

Starting with boost 1.46, version 3 is the default and version 2 has
been removed in boost 1.50.
http://code.google.com/p/esteid/source/detail?r=4006

Modified:
/esteid-browser-plugin/trunk/CMakeLists.txt
/esteid-browser-plugin/trunk/PluginSettings.cpp

=======================================
--- /esteid-browser-plugin/trunk/CMakeLists.txt Sun Jul 3 14:53:15 2011
+++ /esteid-browser-plugin/trunk/CMakeLists.txt Wed Jul 18 05:56:03 2012
@@ -45,14 +45,11 @@
endif()

if (WITH_SYSTEM_BOOST)
- # FindBoost.cmake isn't up to date wrt new boost versions
-
set(Boost_ADDITIONAL_VERSIONS "1.44" "1.44.0" "1.43" "1.43.0" "1.42" "1.42.0")
-
if (WIN32)
# boost::signals is only needed for Windows UI code
set(EXTRA_BOOST_COMPONENTS "signals")
endif()
- find_package(Boost 1.41.0 COMPONENTS filesystem system thread
${EXTRA_BOOST_COMPONENTS} REQUIRED)
+ find_package(Boost 1.44 COMPONENTS filesystem system thread
${EXTRA_BOOST_COMPONENTS} REQUIRED)
else()
message(STATUS "Using bundled boost")
if (WIN32)
=======================================
--- /esteid-browser-plugin/trunk/PluginSettings.cpp Fri Jul 1 03:10:06 2011
+++ /esteid-browser-plugin/trunk/PluginSettings.cpp Wed Jul 18 05:56:03 2012
@@ -23,9 +23,9 @@
#include <stdlib.h>
#endif

-#define BOOST_FILESYSTEM_VERSION 2
+#define BOOST_FILESYSTEM_VERSION 3
#include <fstream>
-#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/foreach.hpp>
#include <boost/property_tree/ptree.hpp>
@@ -60,9 +60,9 @@
path PluginSettings::userSettingsDir()
{
#ifdef _WIN32
- return path(getenv("APPDATA"), native);
+ return path(getenv("APPDATA"));
#else // UNIX
- path home(getenv("HOME"), native);
+ path home(getenv("HOME"));
# ifdef __APPLE__
return home / "Library/Application Support";
# else