summaryrefslogtreecommitdiff
path: root/sal/rtl
diff options
context:
space:
mode:
Diffstat (limited to 'sal/rtl')
-rw-r--r--sal/rtl/bootstrap.cxx11
-rw-r--r--sal/rtl/rtl_process.cxx6
2 files changed, 12 insertions, 5 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index 84fd1fc1798b..030afe4e5897 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -37,7 +37,6 @@
#include <rtl/malformeduriexception.hxx>
#include <rtl/uri.hxx>
-#include <boost/noncopyable.hpp>
#include <list>
#include <algorithm>
#include <unordered_map>
@@ -407,7 +406,7 @@ Bootstrap_Impl * get_static_bootstrap_handle()
return s_handle;
}
-struct FundamentalIniData: private boost::noncopyable {
+struct FundamentalIniData {
rtlBootstrapHandle ini;
FundamentalIniData() {
@@ -422,6 +421,9 @@ struct FundamentalIniData: private boost::noncopyable {
}
~FundamentalIniData() { rtl_bootstrap_args_close(ini); }
+
+ FundamentalIniData(const FundamentalIniData&) = delete;
+ FundamentalIniData& operator=(const FundamentalIniData&) = delete;
};
struct FundamentalIni: public rtl::Static< FundamentalIniData, FundamentalIni >
@@ -578,11 +580,14 @@ void Bootstrap_Impl::expandValue(
namespace {
-struct bootstrap_map: private boost::noncopyable {
+struct bootstrap_map {
typedef std::unordered_map<
rtl::OUString, Bootstrap_Impl *,
rtl::OUStringHash > t;
+ bootstrap_map(const bootstrap_map&) = delete;
+ bootstrap_map& operator=(const bootstrap_map&) = delete;
+
// get and release must only be called properly synchronized via some mutex
// (e.g., osl::Mutex::getGlobalMutex()):
diff --git a/sal/rtl/rtl_process.cxx b/sal/rtl/rtl_process.cxx
index 5eb411ba72d5..a391dc8e7453 100644
--- a/sal/rtl/rtl_process.cxx
+++ b/sal/rtl/rtl_process.cxx
@@ -21,7 +21,6 @@
#include <cstring>
-#include "boost/noncopyable.hpp"
#include "rtl/instance.hxx"
#include "rtl/process.h"
#include "rtl/uuid.h"
@@ -29,10 +28,13 @@
namespace {
-class Id: private boost::noncopyable {
+class Id {
public:
Id() { rtl_createUuid(uuid_, nullptr, false); }
+ Id(const Id&) = delete;
+ Id& operator=(const Id&) = delete;
+
void copy(sal_uInt8 * target) const
{ std::memcpy(target, uuid_, UUID_SIZE); }