more tests and better diagnostics for unique_any (refs #24)

Author: apolukhin

include/boost/any/fwd.hpp

@@ -33,6 +33,16 @@ namespace detail {
 
     template<std::size_t OptimizeForSize, std::size_t OptimizeForAlignment>
     struct is_basic_any<boost::anys::basic_any<OptimizeForSize, OptimizeForAlignment> > : public true_type {};
+
+    template <class T>
+    struct is_some_any: public is_basic_any<T> {};
+
+    template <>
+    struct is_some_any<boost::any>: public boost::true_type {};
+
+    template <>
+    struct is_some_any<boost::anys::unique_any>: public boost::true_type {};
+
 } // namespace detail
 
 } // namespace anys

include/boost/any/unique_any.hpp

@@ -34,6 +34,7 @@
 #include <utility>
 #include <type_traits>
 
+#include <boost/any/fwd.hpp>
 #include <boost/any/bad_any_cast.hpp>
 
 #include <boost/type_index.hpp>
@@ -58,13 +59,19 @@ class unique_any {
 
     // Perfect forwarding of T
     template<typename T>
-    unique_any(T&& value
-        , typename std::enable_if<
-            !std::is_same<unique_any&, T>::value // disable if value has type `unique_any&`
-            && !std::is_const<T>::value
-        >::type* = 0) // disable if value has type `const T&&`
+    unique_any(T&& value)
       : content(new holder< typename std::decay<T>::type >(std::forward<T>(value)))
     {
+        static_assert(
+            !boost::anys::detail::is_basic_any< typename std::decay<T>::type >::value,
+            "boost::anys::unique_any could not be constructed from boost::anys::basic_any."
+        );
+
+        static_assert(
+            !boost::anys::detail::is_some_any< typename std::decay<T>::type >::value,
+            "unique_any could be only moved and could not be constructoed from "
+            "other types of any."
+        );
     }
 
     template<class T, class... Args>

test/unique_any/Jamfile.v2

@@ -1,10 +1,13 @@
-#  Copyright Vladimir Prus 2005. Use, modification and
+#  Copyright Vladimir Prus 2005.
+#  Copyright Antony Polukhin, 2013-2023.
+#
+#  Use, modification and
 #  distribution is subject to the Boost Software License, Version
 #  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 #  http://www.boost.org/LICENSE_1_0.txt)
 #
 # For more information, see http://www.boost.org/libs/any
-#
+
 import ../../config/checks/config : requires ;
 
 import testing ;
@@ -16,15 +19,19 @@ project
     ;
 
 test-suite unique_any :
-    [ run base.cpp : : : : base ]
-    [ run base.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : no_rtti_base ]
-    [ run move.cpp : : : : move ]
-    [ run move.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : no_rtti_move ]
-    [ run emplace.cpp : : : : emplace ]
-    [ run emplace.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : no_rtti_emplace ]
-    [ compile-fail any_cast_cv_failed.cpp ]
-    [ compile-fail temporary_to_ref_failed.cpp ]
-    [ compile-fail cv_to_rv_failed.cpp ]
+    [ run base.cpp : : : : unique_base ]
+    [ run base.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : no_rtti_unique_base ]
+    [ run move.cpp : : : : unique_move ]
+    [ run move.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : no_rtti_unique_move ]
+    [ run emplace.cpp : : : : unique_emplace ]
+    [ run emplace.cpp : : : <rtti>off <define>BOOST_NO_RTTI <define>BOOST_NO_TYPEID : no_rtti_unique_emplace ]
+    [ compile-fail any_cast_cv_failed.cpp : : unique_any_cast_cd_failed ]
+    [ compile-fail temporary_to_ref_failed.cpp : : unique_temporary_to_ref_failed  ]
+    [ compile-fail cv_to_rv_failed.cpp : : unique_cv_to_rv_failed ]
+    [ compile-fail const_rvalue_construction_failed.cpp : : unique_const_rvalue_construction_failed ]
+
+    [ compile-fail from_any_failed.cpp : : unique_from_any_failed ]
+    [ compile-fail from_basic_any_failed.cpp : : unique_from_basic_any_failed ]
   ;
 
 

test/unique_any/const_rvalue_construction_failed.cpp

@@ -0,0 +1,17 @@
+//  Copyright Antony Polukhin, 2013-2023.
+//
+//  Distributed under the Boost
+//  Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt).
+
+#include <boost/any/unique_any.hpp>
+
+const boost::anys::unique_any&& get() {
+    static const boost::anys::unique_any a;
+    return std::move(a);
+}
+
+int main() {
+    boost::anys::unique_any b(get());
+    (void)b;
+}

test/unique_any/from_any_failed.cpp

@@ -0,0 +1,14 @@
+//  Copyright Antony Polukhin, 2013-2023.
+//
+//  Distributed under the Boost
+//  Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt).
+
+#include <boost/any.hpp>
+#include <boost/any/unique_any.hpp>
+
+int main() {
+    boost::any a;
+    boost::anys::unique_any b(a);
+    (void)b;
+}

test/unique_any/from_basic_any_failed.cpp

@@ -0,0 +1,14 @@
+//  Copyright Antony Polukhin, 2013-2023.
+//
+//  Distributed under the Boost
+//  Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt).
+
+#include <boost/any/basic_any.hpp>
+#include <boost/any/unique_any.hpp>
+
+int main() {
+    boost::anys::basic_any<> a;
+    boost::anys::unique_any b(a);
+    (void)b;
+}