diff options
Diffstat (limited to 'sal/rtl/bootstrap.cxx')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index 9feadf874e54..e651a8436363 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -33,7 +33,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <rtl/byteseq.hxx> -#include <rtl/instance.hxx> #include <rtl/malformeduriexception.hxx> #include <rtl/uri.hxx> #include <sal/log.hxx> @@ -407,8 +406,11 @@ struct FundamentalIniData FundamentalIniData& operator=(const FundamentalIniData&) = delete; }; -struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni > -{}; +FundamentalIniData& FundamentalIni() +{ + static FundamentalIniData SINGLETON; + return SINGLETON; +} } @@ -511,7 +513,7 @@ bool Bootstrap_Impl::getValue( if (mode == LOOKUP_MODE_NORMAL) { - FundamentalIniData const & d = FundamentalIni::get(); + FundamentalIniData const & d = FundamentalIni(); Bootstrap_Impl const * b = static_cast<Bootstrap_Impl const *>(d.ini); if (b != nullptr && b != this && b->getDirectValue(key, value, mode, requestStack)) return true; |