Merge branch 'master' into doxygen

2018-03-19 21:54:46 +01:00 · 2018-03-19 21:54:46 +01:00 · b7f78dd5a7
commit b7f78dd5a7
parent d42a5f2ce3 b5796019e0
232 changed files with 5648 additions and 2419 deletions
--- a/Examples/test-suite/java/Makefile.in
+++ b/Examples/test-suite/java/Makefile.in
@ -47,6 +47,10 @@ CPP_TEST_CASES = \
 #	li_boost_intrusive_ptr

 CPP11_TEST_CASES = \
+	cpp11_shared_ptr_const \
+	cpp11_shared_ptr_nullptr_in_containers \
+	cpp11_shared_ptr_overload \
+	cpp11_shared_ptr_upcast \
 	cpp11_strongly_typed_enumerations_simple \

 DOXYGEN_TEST_CASES := \