[Libreoffice-commits] .: 2 commits - include/cppunit src/cppunit

[Libreoffice Gerrit user]

 include/cppunit/TextTestResult.h |    2 ++
 src/cppunit/TestCase.cpp         |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit c4f7bf8d1346bdfc4d34af24b373e6a0aeb6cc46
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 16 10:25:03 2013 +0200

    -Werror,-Wbind-to-temporary-copy
    
    "C++98 requires an accessible copy constructor for class
    'CppUnit::TestCaseMethodFunctor' when binding a reference to a temporary; was
    private." (Clang)

diff --git a/src/cppunit/TestCase.cpp b/src/cppunit/TestCase.cpp
index 10ff578..13c0525 100644
--- a/src/cppunit/TestCase.cpp
+++ b/src/cppunit/TestCase.cpp
@@ -34,10 +34,6 @@ public:
   }
 
 private:
-  // disable copying
-  TestCaseMethodFunctor( const TestCaseMethodFunctor& );
-  // disable copying
-  TestCaseMethodFunctor& operator=( const TestCaseMethodFunctor& );
   TestCase *m_target;
   Method m_method;
 };
commit d831d2d72f93fc24462bec8f296fd870c8f8407c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Aug 16 10:14:06 2013 +0200

    -Werror,-Woverloaded-virtual
    
    "'CppUnit::TextTestResult::addFailure' hides overloaded virtual function;
    ../../include/cppunit/TestResult.h:85:16: note: hidden overloaded virtual
    function 'CppUnit::TestResult::addFailure' declared here: different number of
    parameters (2 vs 1)." (Clang)

diff --git a/include/cppunit/TextTestResult.h b/include/cppunit/TextTestResult.h
index e7b1fa3..63937b0 100644
--- a/include/cppunit/TextTestResult.h
+++ b/include/cppunit/TextTestResult.h
@@ -26,6 +26,8 @@ public:
   virtual void addFailure( const TestFailure &failure );
   virtual void startTest( Test *test );
   virtual void print( OStream &stream );
+
+  using TestResult::addFailure;
 };
 
 /** insertion operator for easy output */