Kaydet (Commit) bf96ec5d authored tarafından Caolán McNamara's avatar Caolán McNamara

boost->std

Change-Id: I44b208a2c5c5bf73ac025462c9f7bd499ed0a49b
üst 6b45e4fa
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <basic/sbdef.hxx> #include <basic/sbdef.hxx>
#include <basic/sbxobj.hxx> #include <basic/sbxobj.hxx>
#include <basic/sbxdef.hxx> #include <basic/sbxdef.hxx>
#include <boost/utility.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <svtools/miscopt.hxx> #include <svtools/miscopt.hxx>
#include <unordered_map> #include <unordered_map>
......
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <vector> #include <vector>
#include <deque> #include <deque>
#include <boost/utility.hpp>
#include <basic/basicdllapi.h> #include <basic/basicdllapi.h>
#include <basic/codecompletecache.hxx> #include <basic/codecompletecache.hxx>
...@@ -46,7 +45,7 @@ class ModuleInitDependencyMap; ...@@ -46,7 +45,7 @@ class ModuleInitDependencyMap;
struct ClassModuleRunInitItem; struct ClassModuleRunInitItem;
struct SbClassData; struct SbClassData;
class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable class BASIC_DLLPUBLIC SbModule : public SbxObject
{ {
friend class SbiCodeGen; friend class SbiCodeGen;
friend class SbMethod; friend class SbMethod;
...@@ -58,6 +57,8 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable ...@@ -58,6 +57,8 @@ class BASIC_DLLPUBLIC SbModule : public SbxObject, private ::boost::noncopyable
BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic ); BASIC_DLLPRIVATE void implClearIfVarDependsOnDeletedBasic( SbxVariable* pVar, StarBASIC* pDeletedBasic );
SbModule(const SbModule&) SAL_DELETED_FUNCTION;
SbModule& operator=(const SbModule&) SAL_DELETED_FUNCTION;
protected: protected:
com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper; com::sun::star::uno::Reference< com::sun::star::script::XInvocation > mxWrapper;
OUString aOUSource; OUString aOUSource;
......
...@@ -22,16 +22,13 @@ ...@@ -22,16 +22,13 @@
#include <comphelper/comphelperdllapi.h> #include <comphelper/comphelperdllapi.h>
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/noncopyable.hpp>
#include <boost/bind.hpp> #include <boost/bind.hpp>
namespace comphelper { namespace comphelper {
/** ScopeGuard to ease writing exception-safe code. /** ScopeGuard to ease writing exception-safe code.
*/ */
class COMPHELPER_DLLPUBLIC ScopeGuard : private ::boost::noncopyable class COMPHELPER_DLLPUBLIC ScopeGuard
// noncopyable until we have
// good reasons...
{ {
public: public:
enum exc_handling { IGNORE_EXCEPTIONS, ALLOW_EXCEPTIONS }; enum exc_handling { IGNORE_EXCEPTIONS, ALLOW_EXCEPTIONS };
...@@ -53,6 +50,10 @@ public: ...@@ -53,6 +50,10 @@ public:
void dismiss(); void dismiss();
private: 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 ::boost::function0<void> m_func; // preferring portable syntax
exc_handling const m_excHandling; exc_handling const m_excHandling;
}; };
......
...@@ -22,14 +22,13 @@ ...@@ -22,14 +22,13 @@
#include <sal/config.h> #include <sal/config.h>
#include <boost/noncopyable.hpp>
#include <comphelper/comphelperdllapi.h> #include <comphelper/comphelperdllapi.h>
namespace comphelper { namespace comphelper {
/** SolarMutex interface, needed for Application::GetSolarMutex(). /** SolarMutex interface, needed for Application::GetSolarMutex().
*/ */
class COMPHELPER_DLLPUBLIC SolarMutex: private boost::noncopyable { class COMPHELPER_DLLPUBLIC SolarMutex {
public: public:
virtual void acquire() = 0; virtual void acquire() = 0;
...@@ -41,6 +40,9 @@ protected: ...@@ -41,6 +40,9 @@ protected:
SolarMutex(); SolarMutex();
virtual ~SolarMutex(); virtual ~SolarMutex();
private:
SolarMutex(const SolarMutex&) SAL_DELETED_FUNCTION;
SolarMutex& operator=(const SolarMutex&) SAL_DELETED_FUNCTION;
}; };
} }
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#ifndef INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX #ifndef INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
#define INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX #define INCLUDED_COMPHELPER_SYNTAXHIGHLIGHT_HXX
#include <boost/noncopyable.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <comphelper/comphelperdllapi.h> #include <comphelper/comphelperdllapi.h>
...@@ -66,13 +65,15 @@ enum HighlighterLanguage ...@@ -66,13 +65,15 @@ enum HighlighterLanguage
HIGHLIGHT_SQL HIGHLIGHT_SQL
}; };
class COMPHELPER_DLLPUBLIC SyntaxHighlighter: private boost::noncopyable class COMPHELPER_DLLPUBLIC SyntaxHighlighter
{ {
class Tokenizer; class Tokenizer;
HighlighterLanguage eLanguage; HighlighterLanguage eLanguage;
std::unique_ptr<Tokenizer> m_tokenizer; std::unique_ptr<Tokenizer> m_tokenizer;
SyntaxHighlighter(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
SyntaxHighlighter& operator=(const SyntaxHighlighter&) SAL_DELETED_FUNCTION;
public: public:
SyntaxHighlighter(HighlighterLanguage language); SyntaxHighlighter(HighlighterLanguage language);
~SyntaxHighlighter(); ~SyntaxHighlighter();
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <boost/noncopyable.hpp>
#include <vector> #include <vector>
#include <comphelper/comphelperdllapi.h> #include <comphelper/comphelperdllapi.h>
...@@ -30,7 +29,7 @@ public: ...@@ -30,7 +29,7 @@ public:
}; };
/// A very basic thread pool implementation /// A very basic thread pool implementation
class COMPHELPER_DLLPUBLIC ThreadPool: private boost::noncopyable class COMPHELPER_DLLPUBLIC ThreadPool
{ {
public: public:
/// returns a pointer to a shared pool with optimal thread /// returns a pointer to a shared pool with optimal thread
...@@ -47,6 +46,9 @@ public: ...@@ -47,6 +46,9 @@ public:
void waitUntilEmpty(); void waitUntilEmpty();
private: private:
ThreadPool(const ThreadPool&) SAL_DELETED_FUNCTION;
ThreadPool& operator=(const ThreadPool&) SAL_DELETED_FUNCTION;
class ThreadWorker; class ThreadWorker;
friend class ThreadWorker; friend class ThreadWorker;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h> #include <i18nlangtag/lang.h>
#include <boost/shared_ptr.hpp> #include <memory>
#include <vector> #include <vector>
typedef struct _rtl_Locale rtl_Locale; // as in rtl/locale.h typedef struct _rtl_Locale rtl_Locale; // as in rtl/locale.h
...@@ -507,7 +507,7 @@ public: ...@@ -507,7 +507,7 @@ public:
/** @ATTENTION: _ONLY_ to be called by the application's configuration! */ /** @ATTENTION: _ONLY_ to be called by the application's configuration! */
static void setConfiguredSystemLanguage( LanguageType nLang ); static void setConfiguredSystemLanguage( LanguageType nLang );
typedef ::boost::shared_ptr< LanguageTagImpl > ImplPtr; typedef std::shared_ptr< LanguageTagImpl > ImplPtr;
private: private:
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#ifndef INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX #ifndef INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX
#define INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX #define INCLUDED_I18NUTIL_ONETOONEMAPPING_HXX
#include <boost/noncopyable.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <i18nutil/i18nutildllapi.h> #include <i18nutil/i18nutildllapi.h>
...@@ -41,8 +40,11 @@ struct UnicodePairWithFlag ...@@ -41,8 +40,11 @@ struct UnicodePairWithFlag
UnicodePairFlag flag; 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: public:
oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) ); oneToOneMapping( OneToOneMappingTable_t *rpTable, const size_t rnSize, const size_t rnUnitSize = sizeof(OneToOneMappingTable_t) );
virtual ~oneToOneMapping(); virtual ~oneToOneMapping();
...@@ -60,6 +62,10 @@ protected: ...@@ -60,6 +62,10 @@ protected:
class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping class I18NUTIL_DLLPUBLIC oneToOneMappingWithFlag : public oneToOneMapping
{ {
private:
oneToOneMappingWithFlag(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION;
oneToOneMappingWithFlag& operator=(const oneToOneMappingWithFlag&) SAL_DELETED_FUNCTION;
friend class widthfolding; friend class widthfolding;
public: public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment