diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-16 19:47:20 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-17 20:24:17 +0000 |
| commit | e87071ac57a7711078715d9165c264ec3db180ab (patch) | |
| tree | 6a2c5a62f7fb3f162d1f9e7caf44e6846468532a /package | |
| parent | d0f3363aa8db533ba6fe356053caaf79a1507d14 (diff) | |
replace boost::checked_deleter with std::default_delete
and remove all traces of boost/checked_delete.hpp
Change-Id: I4486d0e07a7197d75f8739c8c6d79670163eaab2
Reviewed-on: https://gerrit.libreoffice.org/33182
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'package')
| -rw-r--r-- | package/Library_xstor.mk | 2 | ||||
| -rw-r--r-- | package/inc/pch/precompiled_xstor.hxx | 1 | ||||
| -rw-r--r-- | package/source/xstor/xstorage.cxx | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk index 612ae0ae0484..29514321962e 100644 --- a/package/Library_xstor.mk +++ b/package/Library_xstor.mk @@ -16,8 +16,6 @@ $(eval $(call gb_Library_set_include,xstor,\ -I$(SRCDIR)/package/inc \ )) -$(eval $(call gb_Library_use_external,xstor,boost_headers)) - $(eval $(call gb_Library_set_precompiled_header,xstor,$(SRCDIR)/package/inc/pch/precompiled_xstor)) $(eval $(call gb_Library_use_sdk_api,xstor)) diff --git a/package/inc/pch/precompiled_xstor.hxx b/package/inc/pch/precompiled_xstor.hxx index ec4bc6359ce6..941d290cbffa 100644 --- a/package/inc/pch/precompiled_xstor.hxx +++ b/package/inc/pch/precompiled_xstor.hxx @@ -33,7 +33,6 @@ #include <stdlib.h> #include <string.h> #include <string> -#include <boost/checked_delete.hpp> #include <osl/diagnose.h> #include <osl/interlck.h> #include <osl/time.h> diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index 68f47a89db85..21ac47d5c150 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -57,8 +57,6 @@ #include "switchpersistencestream.hxx" #include "ohierarchyholder.hxx" -#include <boost/checked_delete.hpp> - using namespace ::com::sun::star; #if OSL_DEBUG_LEVEL > 0 @@ -337,10 +335,10 @@ OStorage_Impl::~OStorage_Impl() m_pParent = nullptr; } - std::for_each(m_aChildrenList.begin(), m_aChildrenList.end(), boost::checked_deleter<SotElement_Impl>()); + std::for_each(m_aChildrenList.begin(), m_aChildrenList.end(), std::default_delete<SotElement_Impl>()); m_aChildrenList.clear(); - std::for_each(m_aDeletedList.begin(), m_aDeletedList.end(), boost::checked_deleter<SotElement_Impl>()); + std::for_each(m_aDeletedList.begin(), m_aDeletedList.end(), std::default_delete<SotElement_Impl>()); m_aDeletedList.clear(); if ( m_nStorageType == embed::StorageFormats::OFOPXML && m_pRelStorElement ) |