diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-18 17:18:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-18 20:43:16 +0000 |
| commit | 6106d99a905883c7325dae252b8b071be1896641 (patch) | |
| tree | bdfc25a94cf1e34f605d1d0dfd4439c80fa8996d /include/comphelper | |
| parent | f7f5fa0d36571b5103a54ed1281668cd23c4ecbc (diff) | |
boost->std
Change-Id: Ifa87783f68b0fab98f8a0f7cd6ed867202b4532f
Diffstat (limited to 'include/comphelper')
| -rw-r--r-- | include/comphelper/logging.hxx | 7 | ||||
| -rw-r--r-- | include/comphelper/sharedmutex.hxx | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/comphelper/logging.hxx b/include/comphelper/logging.hxx index 2e528691743c..0a5e8077fc0d 100644 --- a/include/comphelper/logging.hxx +++ b/include/comphelper/logging.hxx @@ -26,9 +26,8 @@ #include <com/sun/star/logging/XLogHandler.hpp> #include <com/sun/star/logging/LogLevel.hpp> -#include <boost/shared_ptr.hpp> #include <boost/optional.hpp> - +#include <memory> namespace comphelper { @@ -93,7 +92,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC EventLogger { protected: - ::boost::shared_ptr< EventLogger_Impl > m_pImpl; + std::shared_ptr< EventLogger_Impl > m_pImpl; public: /** creates an <code>EventLogger</code> instance working with a css.logging.XLogger @@ -513,7 +512,7 @@ namespace comphelper class COMPHELPER_DLLPUBLIC ResourceBasedEventLogger : public EventLogger { private: - ::boost::shared_ptr< ResourceBasedEventLogger_Data > m_pData; + std::shared_ptr< ResourceBasedEventLogger_Data > m_pData; public: /** creates a resource based event logger diff --git a/include/comphelper/sharedmutex.hxx b/include/comphelper/sharedmutex.hxx index 03397d6bed61..cca7239259b6 100644 --- a/include/comphelper/sharedmutex.hxx +++ b/include/comphelper/sharedmutex.hxx @@ -21,11 +21,8 @@ #define INCLUDED_COMPHELPER_SHAREDMUTEX_HXX #include <comphelper/comphelperdllapi.h> - #include <osl/mutex.hxx> - -#include <boost/shared_ptr.hpp> - +#include <memory> namespace comphelper { @@ -48,7 +45,7 @@ namespace comphelper inline operator ::osl::Mutex& () { return *m_pMutexImpl; } private: - ::boost::shared_ptr< ::osl::Mutex > m_pMutexImpl; + std::shared_ptr< ::osl::Mutex > m_pMutexImpl; }; |