tune ptr_value casts

alib2std/src/extensions/container/ptr_value.hpp

@@ -166,6 +166,28 @@ public:
 		return m_data;
 	}
+	/**
+	 * \brief
+	 * Allow automatic cast to const reference.
+	 *
+	 * \return the holded value
+	 */
+	operator T & ( ) & {
+		return * m_data;
+	}
+
+	/**
+	 * \brief
+	 * Allow automatic cast to const rvalue reference which can be itself binded to const reference.
+	 *
+	 * The expected cast type const T & causes ambuguity in cast resolution, therefore a hack like this was found.
+	 *
+	 * \return the holded value
+	 */
+	operator const T && ( ) const & {
+		return std::move ( * m_data );
+	}
+
 	/**
 	 * \brief
 	 * Allow automatic cast to rvalue reference which can be itself binded to const reference.

alib2std/test-src/extensions/ParamPassTest.cpp

@@ -13,7 +13,7 @@ void ParamPassTest::setUp ( ) {
 void ParamPassTest::tearDown ( ) {
 }
-int instances = 0;
+int instances = 0; // set to expected number of instances created in parameter pass test including the original
 class FooCloneable {
 	int m_data;
@@ -94,8 +94,7 @@ public:
 int dest ( FooCloneable && foo ) {
 	std::cout << "Destination called" << std::endl;
-	if ( instances < 2 )
-		throw std::exception ( );
+	CPPUNIT_ASSERT ( instances == 0 );
 	return foo.getData ( );
 }
@@ -103,39 +102,58 @@ int dest ( FooCloneable && foo ) {
 int dest ( FooCopyable && foo ) {
 	std::cout << "Destination called" << std::endl;
-	if ( instances < 2 )
-		throw std::exception ( );
+	CPPUNIT_ASSERT ( instances == 0 );
 	return foo.getData ( );
 }
 int test ( FooCloneable && foo ) {
-	return dest ( std::move ( foo ) );
+	return dest ( std::move ( foo ) ) + 1;
 }
 int test ( const FooCloneable & foo ) {
-	return test ( ext::move_copy ( foo ) );
+	return test ( ext::move_copy ( foo ) ) + 1;
 }
 int test ( FooCopyable && foo ) {
-	return dest ( std::move ( foo ) );
+	return dest ( std::move ( foo ) ) + 1;
 }
 int test ( const FooCopyable & foo ) {
-	return test ( ext::move_copy ( foo ) );
+	return test ( ext::move_copy ( foo ) ) + 1;
 }
 void ParamPassTest::testParameterPassing ( ) {
 	{
+		instances = -2;
 		const FooCloneable foo ( 1 );
 		int res = 0;
-		CPPUNIT_ASSERT_NO_THROW ( res = test ( foo ) );
-		CPPUNIT_ASSERT ( res == 1 && instances == 1 );
+		res = test ( foo );
+		CPPUNIT_ASSERT ( res == 3 );
 	}
+	std::cout << std::endl;
 	{
+		instances = -2;
 		const FooCopyable foo ( 1 );
 		int res = 0;
-		CPPUNIT_ASSERT_NO_THROW ( res = test ( foo ) );
-		CPPUNIT_ASSERT ( res == 1 && instances == 1 );
+		res = test ( foo );
+		CPPUNIT_ASSERT ( res == 3 );
+	}
+	std::cout << std::endl;
+	{
+		instances = -2;
+		ext::ptr_value < FooCopyable > foo ( FooCopyable ( 1 ) );
+		CPPUNIT_ASSERT ( instances == -1 );
+		int res = 0;
+		res = test ( foo );
+		CPPUNIT_ASSERT ( res == 3 );
+	}
+	std::cout << std::endl;
+	{
+		instances = -1;
+		ext::ptr_value < FooCopyable > foo ( FooCopyable ( 1 ) );
+		int res = 0;
+		res = test ( std::move ( foo ) );
+		CPPUNIT_ASSERT ( res == 2 );
 	}
 }