[Libreoffice-commits] core.git: 2 commits - binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk configmgr/CppunitTest_configmgr_unit.mk configmgr/Library_configmgr.mk include/basic include/comphelper include/i18nlangtag include/i18nutil

Caolán McNamara caolanm at redhat.com
Mon Feb 16 05:16:11 PST 2015 

 binaryurp/CppunitTest_binaryurp_test-cache.mk     |    2 ++
 binaryurp/CppunitTest_binaryurp_test-unmarshal.mk |    2 ++
 binaryurp/Library_binaryurp.mk                    |    2 ++
 configmgr/CppunitTest_configmgr_unit.mk           |    1 +
 configmgr/Library_configmgr.mk                    |    2 ++
 include/basic/codecompletecache.hxx               |    1 -
 include/basic/sbmod.hxx                           |    5 +++--
 include/comphelper/scopeguard.hxx                 |    9 +++++----
 include/comphelper/solarmutex.hxx                 |    6 ++++--
 include/comphelper/syntaxhighlight.hxx            |    5 +++--
 include/comphelper/threadpool.hxx                 |    6 ++++--
 include/i18nlangtag/languagetag.hxx               |    4 ++--
 include/i18nutil/oneToOneMapping.hxx              |   10 ++++++++--
 13 files changed, 38 insertions(+), 17 deletions(-)

New commits:
commit bd08ebde36e5bce2d56d1c50b7fd251a2e8035e4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 16 13:15:31 2015 +0000

    restore dependencies
    
    Change-Id: I20645122bc80d729093dff8d1a8094c6fbf7d68a

diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index 91dea7b..59191f3 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
 
+$(eval $(call gb_CppunitTest_use_external,binaryurp_test-cache,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index 730b702..b4da09a 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
 
+$(eval $(call gb_CppunitTest_use_external,binaryurp_test-unmarshal,boost_headers))
+
 $(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
 	cppu \
 	cppuhelper \
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index fb7e594..05f5470 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -13,6 +13,8 @@ $(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp)
 
 $(eval $(call gb_Library_use_udk_api,binaryurp))
 
+$(eval $(call gb_Library_use_external,binaryurp,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,binaryurp,\
 	cppu \
 	cppuhelper \
diff --git a/configmgr/CppunitTest_configmgr_unit.mk b/configmgr/CppunitTest_configmgr_unit.mk
index adec015..1672c9f 100644
--- a/configmgr/CppunitTest_configmgr_unit.mk
+++ b/configmgr/CppunitTest_configmgr_unit.mk
@@ -48,5 +48,6 @@ $(eval $(call gb_CppunitTest_use_components,configmgr_unit,\
 ))
 
 $(eval $(call gb_CppunitTest_use_externals,configmgr_unit,\
+    boost_headers \
     icu_headers \
 ))
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index bab1448..528b150 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -46,6 +46,8 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
     configmgr/source/xmldata \
 ))
 
+$(eval $(call gb_Library_use_external,configmgr,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,configmgr))
 
 $(eval $(call gb_Library_use_libraries,configmgr, \
commit bf96ec5d8af6fe806ee634e556f7a9a105894f0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 16 13:03:53 2015 +0000

    boost->std
    
    Change-Id: I44b208a2c5c5bf73ac025462c9f7bd499ed0a49b

diff --git a/include/basic/codecompletecache.hxx b/include/basic/codecompletecache.hxx
index dad54f0..591daf9 100644
--- a/include/basic/codecompletecache.hxx
+++ b/include/basic/codecompletecache.hxx
@@ -23,7 +23,6 @@
 #include <basic/sbdef.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbxdef.hxx>
-#include <boost/utility.hpp>
 #include <rtl/ustring.hxx>
 #include <svtools/miscopt.hxx>
 #include <unordered_map>
diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx
index 2fd933f..5aaafa7 100644
--- a/include/basic/sbmod.hxx
+++ b/include/basic/sbmod.hxx
@@ -28,7 +28,6 @@
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <deque>
-#include <boost/utility.hpp>
 #include <basic/basicdllapi.h>
 #include <basic/codecompletecache.hxx>
 
@@ -46,7 +45,7 @@ class ModuleInitDependencyMap;
 struct ClassModuleRunInitItem;
 struct SbClassData;
 
-class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable
+class BASIC_DLLPUBLIC SbModule : public SbxObject
 {
     friend class    SbiCodeGen;
     friend class    SbMethod;
@@ -58,6 +57,8 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable
 
     BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
 
+    SbModule(const SbModule&) SAL_DELETED_FUNCTION;
+    SbModule& operator=(const SbModule&) SAL_DELETED_FUNCTION;
 protected:
     com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper;
     OUString            aOUSource;
diff --git a/include/comphelper/scopeguard.hxx b/include/comphelper/scopeguard.hxx
index 7e7d0e3..4f64d5b 100644
--- a/include/comphelper/scopeguard.hxx
+++ b/include/comphelper/scopeguard.hxx
@@ -22,16 +22,13 @@
 
 #include <comphelper/comphelperdllapi.h>
 #include <boost/function.hpp>
-#include <boost/noncopyable.hpp>
 #include <boost/bind.hpp>
 
 namespace comphelper {
 
 /** ScopeGuard to ease writing exception-safe code.
  */
-class COMPHELPER_DLLPUBLIC ScopeGuard : private ::boost::noncopyable
-                                        // noncopyable until we have
-                                        // good reasons...
+class COMPHELPER_DLLPUBLIC ScopeGuard
 {
 public:
     enum exc_handling { IGNORE_EXCEPTIONS, ALLOW_EXCEPTIONS };
@@ -53,6 +50,10 @@ public:
     void dismiss();
 
 private:
+    // noncopyable until we have good reasons...
+    ScopeGuard(const ScopeGuard&) SAL_DELETED_FUNCTION;
+    ScopeGuard& operator=(const ScopeGuard&) SAL_DELETED_FUNCTION;
+
     ::boost::function0<void> m_func; // preferring portable syntax
     exc_handling const m_excHandling;
 };
diff --git a/include/comphelper/solarmutex.hxx b/include/comphelper/solarmutex.hxx
index 6bb93f1..3b66a00 100644
--- a/include/comphelper/solarmutex.hxx
+++ b/include/comphelper/solarmutex.hxx
@@ -22,14 +22,13 @@
 
 #include <sal/config.h>
 
-#include <boost/noncopyable.hpp>
 #include <comphelper/comphelperdllapi.h>
 
 namespace comphelper {
 
 /** SolarMutex interface, needed for Application::GetSolarMutex().
 */
-class COMPHELPER_DLLPUBLIC SolarMutex: private boost::noncopyable {
+class COMPHELPER_DLLPUBLIC SolarMutex {
 public:
     virtual void acquire() = 0;
 
@@ -41,6 +40,9 @@ protected:
     SolarMutex();
 
     virtual ~SolarMutex();
+private:
+    SolarMutex(const SolarMutex&) SAL_DELETED_FUNCTION;
+    SolarMutex& operator=(const SolarMutex&) SAL_DELETED_FUNCTION;
 };
 
 }
diff --git a/include/comphelper/syntaxhighlight.hxx b/include/comphelper/syntaxhighlight.hxx
index 16d3c12..c248749 100644
--- a/include/comphelper/syntaxhighlight.hxx
+++ b/include/comphelper/syntaxhighlight.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
 #define INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
 
-#include <boost/noncopyable.hpp>
 #include <rtl/ustring.hxx>
 
 #include <comphelper/comphelperdllapi.h>
@@ -66,13 +65,15 @@ enum HighlighterLanguage
     HIGHLIGHT_SQL
 };
 
-class COMPHELPER_DLLPUBLIC SyntaxHighlighter: private boost::noncopyable
+class COMPHELPER_DLLPUBLIC SyntaxHighlighter
 {
     class Tokenizer;
 
     HighlighterLanguage eLanguage;
     std::unique_ptr<Tokenizer> m_tokenizer;
 
+    SyntaxHighlighter(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
+    SyntaxHighlighter& operator=(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
 public:
     SyntaxHighlighter(HighlighterLanguage language);
     ~SyntaxHighlighter();
diff --git a/include/comphelper/threadpool.hxx b/include/comphelper/threadpool.hxx
index b5606e0..1aa4733 100644
--- a/include/comphelper/threadpool.hxx
+++ b/include/comphelper/threadpool.hxx
@@ -15,7 +15,6 @@
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
 #include <rtl/ref.hxx>
-#include <boost/noncopyable.hpp>
 #include <vector>
 #include <comphelper/comphelperdllapi.h>
 
@@ -30,7 +29,7 @@ public:
 };
 
 /// A very basic thread pool implementation
-class COMPHELPER_DLLPUBLIC ThreadPool: private boost::noncopyable
+class COMPHELPER_DLLPUBLIC ThreadPool
 {
 public:
     /// returns a pointer to a shared pool with optimal thread
@@ -47,6 +46,9 @@ public:
     void        waitUntilEmpty();
 
 private:
+    ThreadPool(const ThreadPool&) SAL_DELETED_FUNCTION;
+    ThreadPool& operator=(const ThreadPool&) SAL_DELETED_FUNCTION;
+
     class ThreadWorker;
     friend class ThreadWorker;
 
diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx
index 3d484ad..18ec22e 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -16,7 +16,7 @@
 #include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
 
-#include <boost/shared_ptr.hpp>
+#include <memory>
 #include <vector>
 
 typedef struct _rtl_Locale rtl_Locale;  // as in rtl/locale.h
@@ -507,7 +507,7 @@ public:
     /** @ATTENTION: _ONLY_ to be called by the application's configuration! */
     static void setConfiguredSystemLanguage( LanguageType nLang );
 
-    typedef ::boost::shared_ptr< LanguageTagImpl > ImplPtr;
+    typedef std::shared_ptr< LanguageTagImpl > ImplPtr;
 
 private:
 
diff --git a/include/i18nutil/oneToOneMapping.hxx b/include/i18nutil/oneToOneMapping.hxx
index 72a0b93..cde6681 100644
--- a/include/i18nutil/oneToOneMapping.hxx
+++ b/include/i18nutil/oneToOneMapping.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX
 #define INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX
 
-#include <boost/noncopyable.hpp>
 #include <rtl/ustring.hxx>
 #include <i18nutil/i18nutildllapi.h>
 
@@ -41,8 +40,11 @@ struct UnicodePairWithFlag
     UnicodePairFlag flag;
 };
 
-class I18NUTIL_DLLPUBLIC oneToOneMapping : private boost::noncopyable
+class I18NUTIL_DLLPUBLIC oneToOneMapping
 {
+private:
+    oneToOneMapping(const oneToOneMapping&) SAL_DELETED_FUNCTION;
+    oneToOneMapping& operator=(const oneToOneMapping&) SAL_DELETED_FUNCTION;
 public:
     oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) );
     virtual ~oneToOneMapping();
@@ -60,6 +62,10 @@ protected:
 
 class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping
 {
+private:
+    oneToOneMappingWithFlag(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION;
+    oneToOneMappingWithFlag& operator=(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION;
+
     friend class widthfolding;
 
 public:

More information about the Libreoffice-commits mailing list