Merge pull request #61 from jakirkham/drop_leftover_cxx11

Pre-C++11 (Part 2)

CMakeLists.txt

@@ -91,6 +91,7 @@ if(${USE_CYTHON})
 else()
     find_package(Boost "1.56.0" REQUIRED COMPONENTS container python)
     find_package(VIGRA REQUIRED)
+    set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
 endif()
 find_package(NUMPY REQUIRED)
 
@@ -125,9 +126,6 @@ else()
     link_directories(${PYTHON_LIBRARY_DIR} ${Boost_LIBRARY_DIRS})
 endif()
 
-# Use C++11
-set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
-
 # Build binary for running base API C++ unitests
 add_executable(cxxtest_base ${CMAKE_CURRENT_SOURCE_DIR}/test/test_rank_filter_base)
 target_link_libraries(cxxtest_base ${Boost_CONTAINER_LIBRARY})

README.rst

@@ -33,7 +33,7 @@ Installation
 
 The easiest way to install is to install our ``conda`` package.
 Alternatively, one can install from ``pip``, but this will require a
-C++11 compatible compiler and a recent version of ``setuptools``.
+C++ compiler and a recent version of ``setuptools``.
 
 Building
 --------

rank_filter.recipe/build.sh

@@ -39,8 +39,8 @@ then
     CXX_LDFLAGS=$DEFAULT_CXX_LDFLAGS
 fi
 
-CXX_FLAGS="${CXXFLAGS} ${CXX_FLAGS} -std=c++11"
-CXX_LDFLAGS="${LDFLAGS} ${CXX_LDFLAGS} -std=c++11"
+CXX_FLAGS="${CXXFLAGS} ${CXX_FLAGS}"
+CXX_LDFLAGS="${LDFLAGS} ${CXX_LDFLAGS}"
 
 # CONFIGURE
 SRC=$(pwd)

test/test_rank_filter_base.cxx

@@ -12,7 +12,7 @@ struct RankFilterBaseFixture
 {
     public:
 
-        static constexpr unsigned long size = 10;
+        static const unsigned long size = 10;
 
         boost::array<double, size> array_1;
         boost::array<double, size> reverse_array_1;