Skip to content

Commit f00b24b

Browse files
author
Dane Springmeyer
committed
move headers into include/mapbox folder - closes #99 
1 parent 35ca16c commit f00b24b

26 files changed

+41
-40
lines changed

‎Makefile

+11-9
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ ifeq (sizes,$(firstword $(MAKECMDGOALS)))
2626
.PHONY: $(RUN_ARGS)
2727
endif
2828

29+
ALL_HEADERS = $(shell find include/mapbox/ '(' -name '*.hpp' ')')
30+
2931
all: out/bench-variant out/unique_ptr_test out/unique_ptr_test out/recursive_wrapper_test out/binary_visitor_test
3032

3133
./deps/gyp:
@@ -36,23 +38,23 @@ gyp: ./deps/gyp
3638
make V=1 -C ./out tests
3739
./out/Release/tests
3840

39-
out/bench-variant-debug: Makefile test/bench_variant.cpp variant.hpp recursive_wrapper.hpp
41+
out/bench-variant-debug: Makefile test/bench_variant.cpp
4042
mkdir -p ./out
4143
$(CXX) -o out/bench-variant-debug test/bench_variant.cpp -I./ -pthreads $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
4244

43-
out/bench-variant: Makefile test/bench_variant.cpp variant.hpp recursive_wrapper.hpp
45+
out/bench-variant: Makefile test/bench_variant.cpp
4446
mkdir -p ./out
4547
$(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
4648

47-
out/unique_ptr_test: Makefile test/unique_ptr_test.cpp variant.hpp recursive_wrapper.hpp
49+
out/unique_ptr_test: Makefile test/unique_ptr_test.cpp
4850
mkdir -p ./out
4951
$(CXX) -o out/unique_ptr_test test/unique_ptr_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
5052

51-
out/recursive_wrapper_test: Makefile test/recursive_wrapper_test.cpp variant.hpp recursive_wrapper.hpp
53+
out/recursive_wrapper_test: Makefile test/recursive_wrapper_test.cpp
5254
mkdir -p ./out
5355
$(CXX) -o out/recursive_wrapper_test test/recursive_wrapper_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
5456

55-
out/binary_visitor_test: Makefile test/binary_visitor_test.cpp variant.hpp variant_io.hpp recursive_wrapper.hpp
57+
out/binary_visitor_test: Makefile test/binary_visitor_test.cpp
5658
mkdir -p ./out
5759
$(CXX) -o out/binary_visitor_test test/binary_visitor_test.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS)
5860

@@ -66,7 +68,7 @@ out/unit.o: Makefile test/unit.cpp
6668
mkdir -p ./out
6769
$(CXX) -c -o $@ test/unit.cpp -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
6870

69-
out/%.o: test/t/%.cpp Makefile optional.hpp recursive_wrapper.hpp variant.hpp variant_io.hpp
71+
out/%.o: test/t/%.cpp Makefile $(ALL_HEADERS)
7072
mkdir -p ./out
7173
$(CXX) -c -o $@ $< -I. -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS)
7274

@@ -81,9 +83,9 @@ coverage:
8183
mkdir -p ./out
8284
$(CXX) -o out/cov-test --coverage test/unit.cpp test/t/*.cpp -I./ -Itest/include $(DEBUG_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS)
8385

84-
sizes: Makefile variant.hpp recursive_wrapper.hpp
86+
sizes: Makefile
8587
mkdir -p ./out
86-
@$(CXX) -o ./out/our_variant_hello_world.out variant.hpp $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/our_variant_hello_world.out
88+
@$(CXX) -o ./out/our_variant_hello_world.out include/mapbox/variant.hpp $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/our_variant_hello_world.out
8789
@$(CXX) -o ./out/boost_variant_hello_world.out $(RUN_ARGS) $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) && du -h ./out/boost_variant_hello_world.out
8890
@$(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
8991
@$(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
@@ -102,7 +104,7 @@ clean:
102104
rm -f test/*gcov
103105
rm -f *.gcda *.gcno
104106

105-
pgo: out Makefile variant.hpp recursive_wrapper.hpp
107+
pgo: out Makefile
106108
$(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -pg -fprofile-generate
107109
./test-variant 500000 >/dev/null 2>/dev/null
108110
$(CXX) -o out/bench-variant test/bench_variant.cpp -I./ $(RELEASE_FLAGS) $(COMMON_FLAGS) $(CXXFLAGS) $(LDFLAGS) $(BOOST_LIBS) -fprofile-use

‎optional.hpp ‎include/mapbox/optional.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <type_traits>
77
#include <utility>
88

9-
#include "variant.hpp"
9+
#include <mapbox/variant.hpp>
1010

1111
namespace mapbox {
1212
namespace util {

‎recursive_wrapper.hpp ‎include/mapbox/recursive_wrapper.hpp

File renamed without changes.

‎variant.hpp ‎include/mapbox/variant.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#include <typeinfo>
1212
#include <utility>
1313

14-
#include "recursive_wrapper.hpp"
14+
#include <mapbox/recursive_wrapper.hpp>
1515

1616
// clang-format off
1717
// [[deprecated]] is only available in C++14, use this for the time being

‎variant_io.hpp ‎include/mapbox/variant_io.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <iosfwd>
55

6-
#include "variant.hpp"
6+
#include <mapbox/variant.hpp>
77

88
namespace mapbox {
99
namespace util {

‎test/bench_variant.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
#include <algorithm>
32
#include <cstdlib>
43
#include <iostream>
@@ -11,7 +10,7 @@
1110
#include <boost/timer/timer.hpp>
1211
#include <boost/variant.hpp>
1312

14-
#include "variant.hpp"
13+
#include <mapbox/variant.hpp>
1514

1615
#define TEXT_SHORT "Test"
1716
#define TEXT_LONG "Testing various variant implementations with a longish string ........................................."

‎test/binary_visitor_test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <utility>
1010
#include <vector>
1111

12-
#include "variant.hpp"
13-
#include "variant_io.hpp"
12+
#include <mapbox/variant.hpp>
13+
#include <mapbox/variant_io.hpp>
1414

1515
using namespace mapbox;
1616

‎test/our_variant_hello_world.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "variant.hpp"
1+
#include <mapbox/variant.hpp>
22

33
#include <stdexcept>
44

‎test/recursive_wrapper_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <boost/timer/timer.hpp>
99

10-
#include "variant.hpp"
10+
#include <mapbox/variant.hpp>
1111

1212
using namespace mapbox;
1313

‎test/reference_wrapper_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include <utility>
77
#include <vector>
88

9-
#include "variant.hpp"
9+
#include <mapbox/variant.hpp>
1010

1111
using namespace mapbox;
1212

‎test/t/binary_visitor_1.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "variant.hpp"
2+
#include <mapbox/variant.hpp>
33

44
#define NAME_EXT " i-d"
55
using variant_type = mapbox::util::variant<int, double>;

‎test/t/binary_visitor_2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "variant.hpp"
2+
#include <mapbox/variant.hpp>
33

44
#define NAME_EXT " b-i-d"
55
using variant_type = mapbox::util::variant<bool, int, double>;

‎test/t/binary_visitor_3.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "variant.hpp"
2+
#include <mapbox/variant.hpp>
33

44
#define NAME_EXT " i-d-b"
55
using variant_type = mapbox::util::variant<int, double, bool>;

‎test/t/binary_visitor_4.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "variant.hpp"
2+
#include <mapbox/variant.hpp>
33

44
#define NAME_EXT " b-i-d-c"
55
using variant_type = mapbox::util::variant<bool, int, double, char>;

‎test/t/binary_visitor_5.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "variant.hpp"
2+
#include <mapbox/variant.hpp>
33

44
#define NAME_EXT " b-i-c-d-i"
55
using variant_type = mapbox::util::variant<bool, int, char, double, int>;

‎test/t/binary_visitor_6.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "variant.hpp"
2+
#include <mapbox/variant.hpp>
33

44
#define NAME_EXT " b-i-i-d-c-u"
55
using variant_type = mapbox::util::variant<bool, int, int, double, char, short int>;

‎test/t/binary_visitor_impl.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "catch.hpp"
55

6-
#include "variant_io.hpp"
6+
#include <mapbox/variant_io.hpp>
77

88
struct add_visitor
99
{

‎test/t/issue21.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
#include "catch.hpp"
33

4-
#include "variant.hpp"
5-
#include "variant_io.hpp"
4+
#include <mapbox/variant.hpp>
5+
#include <mapbox/variant_io.hpp>
66

77
// https://github.com/mapbox/variant/issues/21
88

‎test/t/mutating_visitor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
#include "catch.hpp"
33

4-
#include "variant.hpp"
5-
#include "variant_io.hpp"
4+
#include <mapbox/variant.hpp>
5+
#include <mapbox/variant_io.hpp>
66

77
#include <string>
88

‎test/t/optional.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "catch.hpp"
33

4-
#include "optional.hpp"
4+
#include <mapbox/optional.hpp>
55

66
struct dummy
77
{

‎test/t/recursive_wrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "catch.hpp"
33

4-
#include "recursive_wrapper.hpp"
4+
#include <mapbox/recursive_wrapper.hpp>
55

66
#include <type_traits>
77
#include <utility>

‎test/t/sizeof.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
#include "catch.hpp"
77

8-
#include "variant.hpp"
9-
#include "variant_io.hpp"
8+
#include <mapbox/variant.hpp>
9+
#include <mapbox/variant_io.hpp>
1010

1111
struct some_struct
1212
{

‎test/t/unary_visitor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
#include "catch.hpp"
33

4-
#include "variant.hpp"
5-
#include "variant_io.hpp"
4+
#include <mapbox/variant.hpp>
5+
#include <mapbox/variant_io.hpp>
66

77
#include <string>
88

‎test/t/variant.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "catch.hpp"
22

3-
#include "variant.hpp"
4-
#include "variant_io.hpp"
3+
#include <mapbox/variant.hpp>
4+
#include <mapbox/variant_io.hpp>
55

66
#include <algorithm>
77
#include <cstdint>

‎test/unique_ptr_test.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include <boost/timer/timer.hpp>
1010

11-
#include "variant.hpp"
11+
#include <mapbox/variant.hpp>
1212

1313
using namespace mapbox;
1414

‎variant.gyp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"SUPPORTED_PLATFORMS":["macosx"]
2828
},
2929
"include_dirs": [
30-
"./",
30+
"./include",
3131
"test/include"
3232
]
3333
}

0 commit comments

Comments
 (0)