From 1f2a48e63e3a42584956b5ff191905548c0b54b8 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Sat, 27 Feb 2016 00:14:10 +0100 Subject: [PATCH] test boost fs --- .travis.yml | 2 +- include/nana/filesystem/filesystem_selector.hpp | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c3b00bb2..216196c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,6 @@ before_script : - cd bld script: - - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=OFF -DBUILD_NANA_DEMOS=ON -DENABLE_AUDIO=OFF -DCMAKE_FIND_BOOST_FILESYSTEM=OFF -DINCLUDE_EXPERIMENTAL_DEMOS=ON + - cmake -G"Unix Makefiles" .. -DENABLE_JPEG=ON -DENABLE_PNG=OFF -DBUILD_NANA_DEMOS=ON -DENABLE_AUDIO=OFF -DCMAKE_FIND_BOOST_FILESYSTEM=ON -DINCLUDE_EXPERIMENTAL_DEMOS=ON - make \ No newline at end of file diff --git a/include/nana/filesystem/filesystem_selector.hpp b/include/nana/filesystem/filesystem_selector.hpp index 5b00e0c7..b2a02293 100644 --- a/include/nana/filesystem/filesystem_selector.hpp +++ b/include/nana/filesystem/filesystem_selector.hpp @@ -55,13 +55,7 @@ namespace std { namespace std { namespace experimental { namespace filesystem { - -# ifdef CXX_NO_INLINE_NAMESPACE - using namespace boost::experimental::filesystem; -# else - using namespace boost::experimental::filesystem::v3; -# endif - + using namespace boost::filesystem; } // filesystem } // experimental } // std