diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-04-07 20:31:52 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-04-08 09:58:36 +0000 |
commit | f781997ee1dcb61b01b04cc050001e2f46b12dfe (patch) | |
tree | 83be657f44225dc68fd0a47d129ab0a27817273c /comphelper/source/container | |
parent | 98d7b02f2b69f2f88a03054183933df7f190017d (diff) |
tdf#94306 replace boost::noncopyable in c...
comphelper, connectivity and cppcanvas.
Replace with C++11 delete copy-constructur
and copy-assignment.
Removed unused boost/noncopyable.hpp includes from
some source files in cppcanvas.
Change-Id: I90780820e21fbfd291ac10c266e7d16616e3a81b
Reviewed-on: https://gerrit.libreoffice.org/23905
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'comphelper/source/container')
-rw-r--r-- | comphelper/source/container/enumerablemap.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index fc255f0aba7f..afbfb29fc109 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -42,8 +42,6 @@ #include <memory> #include <utility> -#include <boost/noncopyable.hpp> - namespace comphelper { @@ -212,7 +210,7 @@ namespace comphelper }; - class MapEnumerator: private boost::noncopyable + class MapEnumerator { public: MapEnumerator( ::cppu::OWeakObject& _rParent, MapData& _mapData, const EnumerationType _type ) @@ -239,6 +237,10 @@ namespace comphelper } } + // noncopyable + MapEnumerator(const MapEnumerator&) = delete; + const MapEnumerator& operator=(const MapEnumerator&) = delete; + // XEnumeration equivalents bool hasMoreElements(); Any nextElement(); |