Merge branch 'master' into doxygen

Examples/test-suite/ruby/Makefile.in

@@ -11,7 +11,6 @@ top_srcdir   = @top_srcdir@
 top_builddir = @top_builddir@
 
 CPP_TEST_CASES = \
-	li_boost_shared_ptr_director \
 	li_cstring \
 	li_factory \
 	li_std_functors \
@@ -36,6 +35,7 @@ CPP11_TEST_CASES = \
 	cpp11_hash_tables \
 	cpp11_shared_ptr_const \
 	cpp11_shared_ptr_nullptr_in_containers \
+	cpp11_shared_ptr_overload \
 	cpp11_shared_ptr_upcast \
 	cpp11_std_unordered_map \
 	cpp11_std_unordered_multimap \

Examples/test-suite/ruby/li_boost_shared_ptr_director_runme.rb

@@ -25,7 +25,11 @@ class Derived < Base
     c.get_m
   end
 
-  def take_c_shared_ptr_by_value(c)
+  def take_c_by_ref(c)
+    c.get_m
+  end
+
+  def take_c_by_pointer(c)
     if c
       c.get_m
     else
@@ -33,7 +37,7 @@ class Derived < Base
     end
   end
 
-  def take_c_shared_ptr_by_ref(c)
+  def take_c_by_pointer_ref(c)
     if c
       c.get_m
     else
@@ -41,7 +45,7 @@ class Derived < Base
     end
   end
 
-  def take_c_shared_ptr_by_pointer(c)
+  def take_c_shared_ptr_by_value(c)
     if c
       c.get_m
     else
@@ -49,7 +53,7 @@ class Derived < Base
     end
   end
 
-  def take_c_shared_ptr_by_pointer_ref(c)
+  def take_c_shared_ptr_by_ref(c)
     if c
       c.get_m
     else
@@ -57,6 +61,22 @@ class Derived < Base
     end
   end
 
+  def take_c_shared_ptr_by_pointer(c)
+    if c
+      c.get_m
+    else
+      -6
+    end
+  end
+
+  def take_c_shared_ptr_by_pointer_ref(c)
+    if c
+      c.get_m
+    else
+      -7
+    end
+  end
+
 end
 
 a = Derived.new(false)
@@ -67,13 +87,17 @@ raise unless call_ret_c_shared_ptr(b) == -1
 raise unless call_ret_c_by_value(a)   ==  1
 
 raise unless call_take_c_by_value(a)                  == 5
-raise unless call_take_c_shared_ptr_by_value(a)       == 6
-raise unless call_take_c_shared_ptr_by_ref(a)         == 7
-raise unless call_take_c_shared_ptr_by_pointer(a)     == 8
-raise unless call_take_c_shared_ptr_by_pointer_ref(a) == 9
-
-raise unless call_take_c_shared_ptr_by_value_with_null(a)       == -2
-raise unless call_take_c_shared_ptr_by_ref_with_null(a)         == -3
-raise unless call_take_c_shared_ptr_by_pointer_with_null(a)     == -4
-raise unless call_take_c_shared_ptr_by_pointer_ref_with_null(a) == -5
+raise unless call_take_c_by_ref(a)                    == 6
+raise unless call_take_c_by_pointer(a)                == 7
+raise unless call_take_c_by_pointer_ref(a)            == 8
+raise unless call_take_c_shared_ptr_by_value(a)       == 9
+raise unless call_take_c_shared_ptr_by_ref(a)         == 10
+raise unless call_take_c_shared_ptr_by_pointer(a)     == 11
+raise unless call_take_c_shared_ptr_by_pointer_ref(a) == 12
 
+raise unless call_take_c_by_pointer_with_null(a)                == -2
+raise unless call_take_c_by_pointer_ref_with_null(a)            == -3
+raise unless call_take_c_shared_ptr_by_value_with_null(a)       == -4
+raise unless call_take_c_shared_ptr_by_ref_with_null(a)         == -5
+raise unless call_take_c_shared_ptr_by_pointer_with_null(a)     == -6
+raise unless call_take_c_shared_ptr_by_pointer_ref_with_null(a) == -7