Merge pull request #101 from mapbox/include

Move headers into include/mapbox folder
mapbox · May 9, 2016 · 1bc46e5 · 1bc46e5
2 parents 13c631a + 390229a
commit 1bc46e5
Show file tree

Hide file tree

Showing 35 changed files with 83 additions and 91 deletions.
diff --git a/Jamroot b/Jamroot
@@ -1,4 +1,4 @@
-# Inofficial and incomplete build file using Boost build system.
+# Unofficial and incomplete build file using Boost build system.
 # You should use make unless you know what you are doing.
 
 local BOOST_DIR = "/usr/local" ;
@@ -17,7 +17,7 @@ exe variant-test
     .//chrono
     :
     <include>$(BOOST_DIR)/include
-    <include>./
+    <include>./include
     #<define>SINGLE_THREADED
     <variant>release:<cxxflags>"-march=native -Wweak-vtables"
     ;
@@ -31,7 +31,7 @@ exe binary-visitor-test
     .//chrono
     :
     <include>$(BOOST_DIR)/include
-    <include>./
+    <include>./include
     <variant>release:<cxxflags>-march=native
     ;
 
@@ -43,7 +43,7 @@ exe recursive-wrapper-test
     .//chrono
     :
     <include>$(BOOST_DIR)/include
-    <include>./
+    <include>./include
     <variant>release:<cxxflags>-march=native
     ;
 
@@ -55,7 +55,7 @@ exe unique-ptr-test
     .//chrono
     :
     <include>$(BOOST_DIR)/include
-    <include>./
+    <include>./include
     <variant>release:<cxxflags>-march=native
     ;
 
@@ -68,6 +68,6 @@ exe reference_wrapper_test
     .//chrono
     :
     <include>$(BOOST_DIR)/include
-    <include>./
+    <include>./include
     <variant>release:<cxxflags>-march=native
     ;
diff --git a/Makefile b/Makefile
@@ -1,4 +1,3 @@
-
 CXX := $(CXX)
 CXX_STD ?= c++11
 
@@ -26,6 +25,8 @@ ifeq (sizes,$(firstword $(MAKECMDGOALS)))
   .PHONY: $(RUN_ARGS)
 endif
 
+ALL_HEADERS = $(shell find include/mapbox/ '(' -name '*.hpp' ')')
+
 all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
 
 ./deps/gyp:
@@ -36,25 +37,25 @@ gyp: ./deps/gyp
 	make V=1 -C ./out tests
 	./out/Release/tests
 
-out/bench-variant-debug: Makefile test/bench_variant.cpp variant.hpp recursive_wrapper.hpp
+out/bench-variant-debug: Makefile test/bench_variant.cpp
 	mkdir -p ./out
-	$(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./ -pthreads $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
+	$(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./include -pthreads $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
 
-out/bench-variant: Makefile test/bench_variant.cpp variant.hpp recursive_wrapper.hpp
+out/bench-variant: Makefile test/bench_variant.cpp
 	mkdir -p ./out
-	$(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
+	$(CXX) -o out/bench-variant test/bench_variant.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
 
-out/unique_ptr_test: Makefile test/unique_ptr_test.cpp variant.hpp recursive_wrapper.hpp
+out/unique_ptr_test: Makefile test/unique_ptr_test.cpp
 	mkdir -p ./out
-	$(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
+	$(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
 
-out/recursive_wrapper_test: Makefile test/recursive_wrapper_test.cpp variant.hpp recursive_wrapper.hpp
+out/recursive_wrapper_test: Makefile test/recursive_wrapper_test.cpp
 	mkdir -p ./out
-	$(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
+	$(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
 
-out/binary_visitor_test: Makefile test/binary_visitor_test.cpp variant.hpp variant_io.hpp recursive_wrapper.hpp
+out/binary_visitor_test: Makefile test/binary_visitor_test.cpp
 	mkdir -p ./out
-	$(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
+	$(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
 
 bench: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
 	./out/bench-variant 100000
@@ -66,9 +67,9 @@ out/unit.o: Makefile test/unit.cpp
 	mkdir -p ./out
 	$(CXX) -c -o $@ test/unit.cpp -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
 
-out/%.o: test/t/%.cpp Makefile optional.hpp recursive_wrapper.hpp variant.hpp variant_io.hpp
+out/%.o: test/t/%.cpp Makefile $(ALL_HEADERS)
 	mkdir -p ./out
-	$(CXX) -c -o $@ $< -I. -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
+	$(CXX) -c -o $@ $< -Iinclude -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
 
 out/unit: out/unit.o out/binary_visitor_1.o out/binary_visitor_2.o out/binary_visitor_3.o out/binary_visitor_4.o out/binary_visitor_5.o out/binary_visitor_6.o out/issue21.o out/mutating_visitor.o out/optional.o out/recursive_wrapper.o out/sizeof.o out/unary_visitor.o out/variant.o
 	mkdir -p ./out
@@ -79,14 +80,14 @@ test: out/unit
 
 coverage:
 	mkdir -p ./out
-	$(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./ -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS)
+	$(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./include -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS)
 
-sizes: Makefile variant.hpp recursive_wrapper.hpp
+sizes: Makefile
 	mkdir -p ./out
-	@$(CXX) -o ./out/our_variant_hello_world.out variant.hpp $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/our_variant_hello_world.out
-	@$(CXX) -o ./out/boost_variant_hello_world.out $(RUN_ARGS) $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/boost_variant_hello_world.out
-	@$(CXX) -o ./out/our_variant_hello_world ./test/our_variant_hello_world.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/our_variant_hello_world
-	@$(CXX) -o ./out/boost_variant_hello_world ./test/boost_variant_hello_world.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/boost_variant_hello_world
+	@$(CXX) -o ./out/our_variant_hello_world.out include/mapbox/variant.hpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/our_variant_hello_world.out
+	@$(CXX) -o ./out/boost_variant_hello_world.out $(RUN_ARGS) -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/boost_variant_hello_world.out
+	@$(CXX) -o ./out/our_variant_hello_world ./test/our_variant_hello_world.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/our_variant_hello_world
+	@$(CXX) -o ./out/boost_variant_hello_world ./test/boost_variant_hello_world.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) &&  du -h ./out/boost_variant_hello_world
 
 profile: out/bench-variant-debug
 	mkdir -p profiling/
@@ -102,9 +103,9 @@ clean:
 	rm -f test/*gcov
 	rm -f *.gcda *.gcno
 
-pgo: out Makefile variant.hpp recursive_wrapper.hpp
-	$(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -pg -fprofile-generate
+pgo: out Makefile
+	$(CXX) -o out/bench-variant test/bench_variant.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -pg -fprofile-generate
 	./test-variant 500000 >/dev/null 2>/dev/null
-	$(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -fprofile-use
+	$(CXX) -o out/bench-variant test/bench_variant.cpp -I./include $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -fprofile-use
 
 .PHONY: sizes test
diff --git a/optional.hpp → include/mapbox/optional.hpp b/optional.hpp → include/mapbox/optional.hpp
@@ -6,7 +6,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 namespace mapbox {
 namespace util {

diff --git a/recursive_wrapper.hpp → include/mapbox/recursive_wrapper.hpp b/recursive_wrapper.hpp → include/mapbox/recursive_wrapper.hpp
diff --git a/variant.hpp → include/mapbox/variant.hpp b/variant.hpp → include/mapbox/variant.hpp
@@ -11,7 +11,7 @@
 #include <typeinfo>
 #include <utility>
 
-#include "recursive_wrapper.hpp"
+#include <mapbox/recursive_wrapper.hpp>
 
 // clang-format off
 // [[deprecated]] is only available in C++14, use this for the time being

diff --git a/variant_io.hpp → include/mapbox/variant_io.hpp b/variant_io.hpp → include/mapbox/variant_io.hpp
@@ -3,7 +3,7 @@
 
 #include <iosfwd>
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 namespace mapbox {
 namespace util {

diff --git a/scripts/run_compilation_failure_tests.sh b/scripts/run_compilation_failure_tests.sh
@@ -14,37 +14,36 @@ fi
 
 error_msg() {
     if [ ! -z "$1" ]; then
-        printf 'output was:\n=======\n%s\n=======\n' "$1"
+	printf 'output was:\n=======\n%s\n=======\n' "$1"
     fi
 }
 
 exit_code=0
 for test_code in $DIR/*.cpp; do
     name=`basename $test_code .cpp`
 
-    result=`${CXX} -std=c++11 -c -o /dev/null -I. ${CXXFLAGS} ${test_code} 2>&1`
+    result=`${CXX} -std=c++11 -c -o /dev/null -I./include ${CXXFLAGS} ${test_code} 2>&1`
     status=$?
 
     if [ $status = 1 ]; then
-        expected=`sed -n -e '/@EXPECTED/s/.*: \+//p' ${test_code}`
-        if echo $result | grep -q "$expected"; then
-            echo "$name [OK]"
-        else
-            echo "$name [FAILED - wrong error message]"
-            echo "Expected error message: $expected"
-            error_msg "$result"
-            exit_code=1
-        fi
+	expected=`sed -n -e '/@EXPECTED/s/.*: \+//p' ${test_code}`
+	if echo $result | grep -q "$expected"; then
+	    echo "$name [OK]"
+	else
+	    echo "$name [FAILED - wrong error message]"
+	    echo "Expected error message: $expected"
+	    error_msg "$result"
+	    exit_code=1
+	fi
     elif [ $status = 0 ]; then
-        echo "$name [FAILED - compile was successful]"
-        error_msg "$result"
-        exit_code=1
+	echo "$name [FAILED - compile was successful]"
+	error_msg "$result"
+	exit_code=1
     else
-        echo "$name [FAILED - unknown error in compile]"
-        error_msg "$result"
-        exit_code=1
+	echo "$name [FAILED - unknown error in compile]"
+	error_msg "$result"
+	exit_code=1
     fi
 done
 
 exit ${exit_code}
-
diff --git a/test/bench_variant.cpp b/test/bench_variant.cpp
@@ -1,4 +1,3 @@
-
 #include <algorithm>
 #include <cstdlib>
 #include <iostream>
@@ -11,7 +10,7 @@
 #include <boost/timer/timer.hpp>
 #include <boost/variant.hpp>
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define TEXT_SHORT "Test"
 #define TEXT_LONG "Testing various variant implementations with a longish string ........................................."

diff --git a/test/binary_visitor_test.cpp b/test/binary_visitor_test.cpp
@@ -9,8 +9,8 @@
 #include <utility>
 #include <vector>
 
-#include "variant.hpp"
-#include "variant_io.hpp"
+#include <mapbox/variant.hpp>
+#include <mapbox/variant_io.hpp>
 
 using namespace mapbox;
 

diff --git a/test/compilation_failure/default_constructor.cpp b/test/compilation_failure/default_constructor.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED: First type in variant must be default constructible to allow default construction of variant
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 // Checks that the first type in a variant must be default constructible to
 // make the variant default constructible.

diff --git a/test/compilation_failure/empty_typelist.cpp b/test/compilation_failure/empty_typelist.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED: Template parameter type list of variant can not be empty
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 // Empty type list should not work.
 

diff --git a/test/compilation_failure/equality.cpp b/test/compilation_failure/equality.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED:
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 int main()
 {

diff --git a/test/compilation_failure/get_type.cpp b/test/compilation_failure/get_type.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED: enable_if
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 int main()
 {

diff --git a/test/compilation_failure/is_type.cpp b/test/compilation_failure/is_type.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED: invalid type in T in `is<T>()` for this variant
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 int main()
 {

diff --git a/test/compilation_failure/mutating_visitor_on_const.cpp b/test/compilation_failure/mutating_visitor_on_const.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED: const int
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 struct mutating_visitor
 {

diff --git a/test/compilation_failure/no-reference.cpp b/test/compilation_failure/no-reference.cpp
@@ -1,7 +1,6 @@
-
 // @EXPECTED: Variant can not hold reference types
 
-#include <variant.hpp>
+#include <mapbox/variant.hpp>
 
 int main()
 {

diff --git a/test/our_variant_hello_world.cpp b/test/our_variant_hello_world.cpp
@@ -1,4 +1,4 @@
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #include <stdexcept>
 

diff --git a/test/recursive_wrapper_test.cpp b/test/recursive_wrapper_test.cpp
@@ -7,7 +7,7 @@
 
 #include <boost/timer/timer.hpp>
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 using namespace mapbox;
 

diff --git a/test/reference_wrapper_test.cpp b/test/reference_wrapper_test.cpp
@@ -6,7 +6,7 @@
 #include <utility>
 #include <vector>
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 using namespace mapbox;
 

diff --git a/test/t/binary_visitor_1.cpp b/test/t/binary_visitor_1.cpp
@@ -1,5 +1,5 @@
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define NAME_EXT " i-d"
 using variant_type = mapbox::util::variant<int, double>;

diff --git a/test/t/binary_visitor_2.cpp b/test/t/binary_visitor_2.cpp
@@ -1,5 +1,5 @@
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define NAME_EXT " b-i-d"
 using variant_type = mapbox::util::variant<bool, int, double>;

diff --git a/test/t/binary_visitor_3.cpp b/test/t/binary_visitor_3.cpp
@@ -1,5 +1,5 @@
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define NAME_EXT " i-d-b"
 using variant_type = mapbox::util::variant<int, double, bool>;

diff --git a/test/t/binary_visitor_4.cpp b/test/t/binary_visitor_4.cpp
@@ -1,5 +1,5 @@
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define NAME_EXT " b-i-d-c"
 using variant_type = mapbox::util::variant<bool, int, double, char>;

diff --git a/test/t/binary_visitor_5.cpp b/test/t/binary_visitor_5.cpp
@@ -1,5 +1,5 @@
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define NAME_EXT " b-i-c-d-i"
 using variant_type = mapbox::util::variant<bool, int, char, double, int>;

diff --git a/test/t/binary_visitor_6.cpp b/test/t/binary_visitor_6.cpp
@@ -1,5 +1,5 @@
 
-#include "variant.hpp"
+#include <mapbox/variant.hpp>
 
 #define NAME_EXT " b-i-i-d-c-u"
 using variant_type = mapbox::util::variant<bool, int, int, double, char, short int>;

diff --git a/test/t/binary_visitor_impl.hpp b/test/t/binary_visitor_impl.hpp
@@ -3,7 +3,7 @@
 
 #include "catch.hpp"
 
-#include "variant_io.hpp"
+#include <mapbox/variant_io.hpp>
 
 struct add_visitor
 {