[Libreoffice-commits] .: desktop/source

[David Tardon]

 desktop/source/deployment/inc/db.hxx |   38 ++++-------------------------------
 1 file changed, 5 insertions(+), 33 deletions(-)

New commits:
commit 081a15646381c3d2b68fb767e87ad91baebc8181
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Nov 16 12:31:21 2010 +0100

    replace dp_internal::Noncopyable by boost::noncopyable

diff --git a/desktop/source/deployment/inc/db.hxx b/desktop/source/deployment/inc/db.hxx
index 4f14466..3fa3d22 100644
--- a/desktop/source/deployment/inc/db.hxx
+++ b/desktop/source/deployment/inc/db.hxx
@@ -28,6 +28,8 @@
 #ifndef BERKELEYDBPROXY_DB_HXX_
 #define BERKELEYDBPROXY_DB_HXX_
 
+#include <boost/noncopyable.hpp>
+
 #ifdef SYSTEM_DB
 #include <db.h>
 #else
@@ -43,26 +45,12 @@ extern "C" {
   typedef void (*db_free_fcn_type)(void *); 
 }
 
-
 namespace berkeleydbproxy {
 
     class DbEnv;
     class Dbc;
     class Dbt;
 
-    namespace db_internal
-    {
-        class Noncopyable
-        {
-            // not implemented
-            Noncopyable(const Noncopyable&);
-            void operator=(const Noncopyable&);
-        protected:
-            Noncopyable() {}
-            ~Noncopyable() {}
-        };
-    }
-    
     class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbException 
     {
         rtl::OString what_;
@@ -78,7 +66,7 @@ namespace berkeleydbproxy {
     };
   
   
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : db_internal::Noncopyable
+    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC DbEnv : boost::noncopyable
     {	
         friend class Db;
     
@@ -89,7 +77,7 @@ namespace berkeleydbproxy {
         static char *strerror(int);
     };
   
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : db_internal::Noncopyable 
+    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Db : boost::noncopyable
     {	
     private:	
         DB* m_pDBP;
@@ -116,7 +104,7 @@ namespace berkeleydbproxy {
         int cursor(DB_TXN *txnid, Dbc **cursorp, u_int32_t flags);
     };
   
-    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : db_internal::Noncopyable 
+    class DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Dbc : boost::noncopyable
     {	
         friend class Db;
         friend class Dbt;
@@ -156,20 +144,4 @@ namespace berkeleydbproxy {
 }
 
 #endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */