diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:27:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-29 15:27:46 +0200 |
| commit | 975565399114f391df3333d6319040e690cde785 (patch) | |
| tree | f19eee07dc7af68932d5a2f1060e620d7de081ad /include | |
| parent | dc635425118c77d35534d1bf8b3aa12a1ad95752 (diff) | |
MSVC 2012 apparently isn't ready yet for std::vector<std::unique_ptr<T>>
...producing error messages about trying to access private undefined unique_ptr
copy ctor etc.
Partial revert of 014e7933af751bfe0a03867373b82efa806f3a3d "svtools:
std::auto_ptr -> std::unique_ptr: ...changing HTMLOptions to
std::vector<std::unique_ptr<...>> because boost::ptr_vector<...>::push_back only
supports auto_ptr, not unique_ptr," going the awkward
std::unique_ptr x(...);
push_back(x.get());
x.release();
route instead (which could be simplified if boost::ptr_vector::push_back ever
started to support unique_ptr).
Change-Id: I15693030a0bbfdedbfdfbe76ede5d0c74f4e5b41
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/parhtml.hxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 09027f46e2c6..ed4f4c386fcf 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -20,14 +20,11 @@ #ifndef INCLUDED_SVTOOLS_PARHTML_HXX #define INCLUDED_SVTOOLS_PARHTML_HXX -#include <sal/config.h> - -#include <memory> -#include <vector> - #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> +#include <boost/ptr_container/ptr_vector.hpp> + namespace com { namespace sun { namespace star { namespace document { class XDocumentProperties; @@ -121,7 +118,7 @@ public: //SvxAdjust GetAdjust() const; // <P,TH,TD ALIGN=> }; -typedef std::vector<std::unique_ptr<HTMLOption>> HTMLOptions; +typedef ::boost::ptr_vector<HTMLOption> HTMLOptions; class SVT_DLLPUBLIC HTMLParser : public SvParser { |