added noexcept and constexpr

nlohmann · Feb 14, 2016 · a69b1a6 · a69b1a6
1 parent 61fe90f
commit a69b1a6
Show file tree

Hide file tree

Showing 4 changed files with 266 additions and 168 deletions.
diff --git a/Makefile b/Makefile
@@ -24,6 +24,15 @@ json_unit: test/unit.cpp src/json.hpp test/catch.hpp
 	$(CXX) -std=c++11 $(CXXFLAGS) $(FLAGS) $(CPPFLAGS) -I src -I test $< $(LDFLAGS) -o $@
 
 
+##########################################################################
+# documentation tests
+##########################################################################
+
+# compile example files and check output
+doctest:
+	make check_output -C doc
+
+
 ##########################################################################
 # static analyzer
 ##########################################################################

diff --git a/doc/Doxyfile b/doc/Doxyfile
@@ -30,6 +30,7 @@ TAB_SIZE               = 4
 ALIASES                = "complexity=@par Complexity\n"
 ALIASES                += liveexample{2}="@par Example\n \1 \n @includelineno \2.cpp \n Output (play with this example @htmlinclude \2.link):\n @verbinclude \2.output \n The example code above can be translated with @verbatim g++ -std=c++11 -Isrc doc/examples/\2.cpp -o \2 @endverbatim"
 ALIASES                += requirement="@par Requirements\n"
+ALIASES                += exceptionsafety="@par Exception safety\n"
 TCL_SUBST              =
 OPTIMIZE_OUTPUT_FOR_C  = NO
 OPTIMIZE_OUTPUT_JAVA   = NO