[Libreoffice-commits] core.git: cppu/CppunitTest_cppu_qa_reference.mk cppu/qa

[Stephan Bergmann]

 cppu/CppunitTest_cppu_qa_reference.mk |    2 ++
 cppu/qa/test_any.cxx                  |    6 ++----
 cppu/qa/test_reference.cxx            |   19 ++++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit 27b7175e36b6ac845a1ba542cfe24430fb63a5a2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Apr 9 09:47:13 2014 +0200

    Clean up function declarations
    
    Change-Id: I2478861e79bbb0f6d7e8a0b7bc59a81f457d92dc

diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index acc996b..de9b281 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -14,6 +14,8 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \
 	cppu/qa/test_reference \
 ))
 
+$(eval $(call gb_CppunitTest_use_external,cppu_qa_reference,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
 	cppu \
 	sal \
diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx
index e022f82..48dfd75 100644
--- a/cppu/qa/test_any.cxx
+++ b/cppu/qa/test_any.cxx
@@ -43,6 +43,7 @@
 #include "Struct2.hpp"
 #include "Struct2a.hpp"
 #include "Struct2b.hpp"
+#include "boost/noncopyable.hpp"
 #include "boost/type_traits/is_same.hpp"
 #include "com/sun/star/uno/Any.hxx"
 #include "com/sun/star/uno/Reference.hxx"
@@ -59,7 +60,7 @@
 
 namespace {
 
-class Base {
+class Base: private boost::noncopyable {
 public:
     Base(): m_count(0) {}
 
@@ -79,9 +80,6 @@ protected:
     virtual ~Base() {}
 
 private:
-    Base(Base &); // not declared
-    void operator =(Base &); // not declared
-
     oslInterlockedCount m_count;
 };
 
diff --git a/cppu/qa/test_reference.cxx b/cppu/qa/test_reference.cxx
index fe3191f6..15f3b7d 100644
--- a/cppu/qa/test_reference.cxx
+++ b/cppu/qa/test_reference.cxx
@@ -19,6 +19,7 @@
 
 #include <sal/types.h>
 
+#include <boost/noncopyable.hpp>
 #include <cppunit/TestSuite.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/TestCase.h>
@@ -39,7 +40,7 @@ using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::RuntimeException;
 using ::com::sun::star::uno::UNO_SET_THROW;
 
-class Foo: public Interface1
+class Foo: public Interface1, private boost::noncopyable
 {
 public:
     Foo()
@@ -82,20 +83,20 @@ protected:
     }
 
 private:
-    Foo(Foo &); // not declared
-    Foo& operator =(const Foo&); // not declared
-
-private:
     oslInterlockedCount m_refCount;
 };
 
 // Check that the up-casting Reference conversion constructor catches the
 // intended cases:
 
-struct Base1: public css::uno::XInterface { virtual ~Base1() = 0; };
-struct Base2: public Base1 {};
-struct Base3: public Base1 {};
-struct Derived: public Base2, public Base3 {};
+struct Base1: public css::uno::XInterface {
+    virtual ~Base1() SAL_DELETED_FUNCTION;
+};
+struct Base2: public Base1 { virtual ~Base2() SAL_DELETED_FUNCTION; };
+struct Base3: public Base1 { virtual ~Base3() SAL_DELETED_FUNCTION; };
+struct Derived: public Base2, public Base3 {
+    virtual ~Derived() SAL_DELETED_FUNCTION;
+};
 
 // The special case using the conversion operator instead:
 css::uno::Reference< css::uno::XInterface > testUpcast1(