Optional cleanup

Author: cristian-anita

doc/cppdevtk_api.chm

@@ -28,11 +28,13 @@
 #include "logger.hpp"
 #include "exception.hpp"
 #include "cassert.hpp"
+#include "static_assert.hpp"
 
 #include <cstddef>
 #include <new>
 #include <algorithm>	// swap(), C++98
 #include <utility>	// swap(), C++11
+#include CPPDEVTK_TR1_HEADER(type_traits)
 
 
 namespace cppdevtk {
@@ -69,7 +71,7 @@ static const NullOptT kNullOpt = (static_cast<NullOptT>(NULL)) ;
 /// - C++ 17 std says that if an ::std::optional<T> contains a value, the value is guaranteed to be allocated
 /// as part of the optional object footprint, i.e. no dynamic memory allocation ever takes place.
 /// Our implementation currently use dynamic memory allocation (need for public API and no time for proper implementation...)!
-/// - Reference types are not supported!
+/// - Reference types are not supported (C++ 17 ::std::optional does not support references, ::boost::optional does)!
 /// \sa
 /// - <a href="http://en.cppreference.com/w/cpp/utility/optional">C++17 optional</a>
 /// - <a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4562.html#optional.object">C++ Extensions for Library Fundamentals, Version 2, 5.3 optional for object types</a>
@@ -78,6 +80,10 @@ static const NullOptT kNullOpt = (static_cast<NullOptT>(NULL)) ;
 template <typename TValue>
 class Optional {
 public:
+	CPPDEVTK_STATIC_ASSERT(!CPPDEVTK_TR1_NS::is_reference<TValue>::value);
+	CPPDEVTK_STATIC_ASSERT((!CPPDEVTK_TR1_NS::is_same<TValue, NullOptT>::value));
+	
+	
 	typedef TValue ValueType;
 	typedef void (*UnspecifiedBoolType)();
 
@@ -361,6 +367,7 @@ void Optional<TValue>::Reset() CPPDEVTK_NOEXCEPT {
 		CPPDEVTK_LOG_FATAL("Optional::Reset(): destructor of TValue (" << typeid(TValue).name()
 			<< ") threw exception: " << Exception::GetDetailedInfo(exc));
 		CPPDEVTK_ASSERT(0 && "Optional::Reset(): destructor of TValue threw exception");
+		SuppressUnusedWarning(exc);
 		terminate();
 	}
 	catch (...) {

include/cppdevtk/base/optional.hpp

@@ -39,10 +39,10 @@
 
 #if (CPPDEVTK_HAVE_CPP11_STATIC_ASSERT)
 #	define CPPDEVTK_STATIC_ASSERT_W_MSG(expr, msg)	\
-		static_assert(expr, msg)
+		static_assert((expr), msg)
 
 #	define CPPDEVTK_STATIC_ASSERT(expr)	\
-		static_assert(expr, #expr)
+		static_assert((expr), "static assert failed: " #expr)
 #else	// (CPPDEVTK_HAVE_CPP11_STATIC_ASSERT)
 #	define CPPDEVTK_STATIC_ASSERT_W_MSG(expr, msg)	\
 		CPPDEVTK_STATIC_ASSERT(expr)

include/cppdevtk/base/static_assert.hpp

@@ -21,6 +21,7 @@
 #include <cppdevtk/base/exception.hpp>
 #include <cppdevtk/base/logger.hpp>
 #include <cppdevtk/base/cassert.hpp>
+#include <cppdevtk/base/unused.hpp>
 
 #include <typeinfo>
 
@@ -49,6 +50,7 @@ void Any::Reset() CPPDEVTK_NOEXCEPT {
 		CPPDEVTK_LOG_FATAL("Any::Reset(): destructor of TypeErasedValue (" << typeid(*pTypeErasedValue_).name()
 			<< ") threw exception: " << Exception::GetDetailedInfo(exc));
 		CPPDEVTK_ASSERT(0 && "Any::Reset(): destructor of TypeErasedValue threw exception");
+		SuppressUnusedWarning(exc);
 		terminate();
 	}
 	catch (...) {

src/base/any.cpp

@@ -34,6 +34,7 @@
 
 #if (CPPDEVTK_DISABLE_CPPDEVTK_WARNINGS && CPPDEVTK_COMPILER_MSVC)
 #	pragma warning(disable: 4459)	// C4459: declaration of 'item' hides global declaration
+#	pragma warning(disable: 4702)	// C4702: unreachable code
 #endif
 
 

src/base/condition_variable_std.cpp

@@ -204,27 +204,26 @@ void test_conditional_ctor_and_get_valur_or ( T const* )
   T& rb = o0.GetValueOr(rz);
   BOOST_TEST_OPTIONAL_CHECK( rb == b ) ;
 
-#if (CPPDEVTK_OPTIONAL_SUPPORTS_REF)
+  // our Optional does not support references
+  /*
   T& ra = a ;
   
   Optional<T&> defref(false,ra);
   BOOST_TEST_OPTIONAL_CHECK(!defref);
 
   Optional<T&> ref(true,ra);
   BOOST_TEST_OPTIONAL_CHECK(!!ref);
-#endif
 
   a = T(432);
 
-#if (CPPDEVTK_OPTIONAL_SUPPORTS_REF)
   BOOST_TEST_OPTIONAL_CHECK( *ref == a ) ;
   
   T& r1 = defref.GetValueOr(z);
   BOOST_TEST_OPTIONAL_CHECK( r1 == z ) ;
 
   T& r2 = ref.GetValueOr(z);
   BOOST_TEST_OPTIONAL_CHECK( r2 == a ) ;
-#endif
+  */
 }
 
 //
@@ -1019,8 +1018,6 @@ class CustomAddressOfClass
     bool operator== (CustomAddressOfClass const& that) const { return n == that.n; }
 };
 
-#if (CPPDEVTK_OPTIONAL_SUPPORTS_ADDRESS_OF)
-
 void test_custom_addressof_operator()
 {
     cppdevtk::base::Optional< CustomAddressOfClass > o1(CustomAddressOfClass(10));
@@ -1035,8 +1032,6 @@ void test_custom_addressof_operator()
     BOOST_TEST_OPTIONAL_CHECK(!o1);
 }
 
-#endif
-
 bool TestOptional() {
 	try {
 		test_with_class_type();
@@ -1045,9 +1040,7 @@ bool TestOptional() {
 		test_conversions1();
 		test_conversions2();
 		//test_swap_tweaking();
-#if (CPPDEVTK_OPTIONAL_SUPPORTS_ADDRESS_OF)
 		test_custom_addressof_operator();
-#endif
 	}
 	catch (const ::std::exception& exc) {
 		::std::cerr << "OptionalTest(): caught exception: " << exc.what() << ::std::endl;

test/test_base/boost_test_optional/optional_test.cpp

@@ -27,8 +27,6 @@
 #include <iostream>
 
 
-#define CPPDEVTK_OPTIONAL_SUPPORTS_REF 0	// FIXME
-#define CPPDEVTK_OPTIONAL_SUPPORTS_ADDRESS_OF 0	// FIXME
 #define CPPDEVTK_TEST_OPTIONAL_VERIFY_LIFETIME 0	// FIXME
 #define CPPDEVTK_TEST_OPTIONAL_ENABLE_TRACE 0