diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-01-30 16:06:11 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-31 12:29:07 +0000 |
| commit | e9a2e0460e3941e9741b368eeaf58b5afbae09bf (patch) | |
| tree | 6d6d0cc3a1f98560ca479d301c629a04c9a1de91 /comphelper | |
| parent | 1ef9f3988ee4dcbc77e1fdefa20442e044a67d4d (diff) | |
OSL_THIS_FUNC is a rip-off of BOOST_CURRENT_FUNCTION so we can use that
as a direct drop in I guess
Change-Id: I3add63f1459f4e659019bd6db54da2f5431958ce
Reviewed-on: https://gerrit.libreoffice.org/21941
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/pch/precompiled_comphelper.hxx | 1 | ||||
| -rw-r--r-- | comphelper/source/misc/documentinfo.cxx | 5 | ||||
| -rw-r--r-- | comphelper/source/misc/storagehelper.cxx | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx index 92f700935906..95cf1c51e764 100644 --- a/comphelper/inc/pch/precompiled_comphelper.hxx +++ b/comphelper/inc/pch/precompiled_comphelper.hxx @@ -38,7 +38,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/current_function.hpp> #include <boost/functional/hash.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index 9a2d6e819334..a30b041a0c8f 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -32,9 +32,6 @@ #include <osl/diagnose.h> #include <osl/thread.h> -#include <boost/current_function.hpp> - - namespace comphelper { @@ -162,7 +159,7 @@ namespace comphelper { caught >>= exception; sMessage += OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); sMessage += "\nin function:\n"; - sMessage += BOOST_CURRENT_FUNCTION; + sMessage += OSL_THIS_FUNC; sMessage += "\n"; OSL_FAIL( sMessage.getStr() ); } diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index bc83276a3a14..4e7a035b9e2c 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -46,8 +46,6 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/storagehelper.hxx> -#include <boost/current_function.hpp> - using namespace ::com::sun::star; namespace comphelper { @@ -277,7 +275,7 @@ sal_Int32 OStorageHelper::GetXStorageFormat( else { // the mediatype is not known - OUString aMsg(BOOST_CURRENT_FUNCTION); + OUString aMsg(OSL_THIS_FUNC); aMsg += ":"; aMsg += OUString::number(__LINE__); aMsg += ": unknown media type '"; |