diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-09 09:53:54 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-09 09:53:54 +0200 |
| commit | c87fa1b51f53f278f06f30305b9e4e4649e43755 (patch) | |
| tree | 6f975abeb96da835fd60ad7538414db6a9d69678 | |
| parent | 3f65d353a652db15dbfd0a750e062286e70619a5 (diff) | |
Clean up function declarations
Change-Id: Ia4ed1d576cb3bcf46de3225e5569f9cfd15a6f7e
| -rw-r--r-- | testtools/Library_constructors.mk | 2 | ||||
| -rw-r--r-- | testtools/source/bridgetest/constructors.cxx | 9 | ||||
| -rw-r--r-- | testtools/source/bridgetest/currentcontextchecker.cxx | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk index d1ea87e79130..516c05d62db8 100644 --- a/testtools/Library_constructors.mk +++ b/testtools/Library_constructors.mk @@ -16,6 +16,8 @@ $(eval $(call gb_Executable_set_include,testtools_constructors,\ $$(INCLUDE) \ )) +$(eval $(call gb_Library_use_external,testtools_constructors,boost_headers)) + $(eval $(call gb_Library_use_internal_api,testtools_constructors,\ bridgetest \ )) diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx index a6ab667c8ffc..6c338035aacf 100644 --- a/testtools/source/bridgetest/constructors.cxx +++ b/testtools/source/bridgetest/constructors.cxx @@ -20,6 +20,7 @@ #include "sal/config.h" +#include "boost/noncopyable.hpp" #include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/lang/XComponent.hpp" #include "com/sun/star/uno/Any.hxx" @@ -49,14 +50,14 @@ namespace { namespace ttb = ::test::testtools::bridgetest; -class Impl: public ::cppu::WeakImplHelper1< css::lang::XInitialization > { +class Impl: + public cppu::WeakImplHelper1<css::lang::XInitialization>, + private boost::noncopyable +{ public: Impl() {} private: - Impl(Impl &); // not defined - void operator =(Impl &); // not defined - virtual ~Impl() {} virtual void SAL_CALL initialize( diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx index 7a2d4ae27590..7924f3fce691 100644 --- a/testtools/source/bridgetest/currentcontextchecker.cxx +++ b/testtools/source/bridgetest/currentcontextchecker.cxx @@ -22,6 +22,7 @@ #include "currentcontextchecker.hxx" +#include "boost/noncopyable.hpp" #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Reference.hxx" #include "com/sun/star/uno/RuntimeException.hpp" @@ -43,7 +44,8 @@ static char const VALUE[] = "good"; class CurrentContext: public ::osl::DebugBase< CurrentContext >, - public ::cppu::WeakImplHelper1< css::uno::XCurrentContext > + public ::cppu::WeakImplHelper1< css::uno::XCurrentContext >, + private boost::noncopyable { public: CurrentContext(); @@ -52,10 +54,6 @@ public: virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - -private: - CurrentContext(CurrentContext &); // not defined - void operator =(CurrentContext &); // not defined }; CurrentContext::CurrentContext() {} |