summaryrefslogtreecommitdiffstats
path: root/include/cppuhelper/unourl.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-01-27 10:03:01 +0100
committerStephan Bergmann <sbergman@redhat.com>2015-01-27 10:03:01 +0100
commit0866023fafe4665f488eaea65a32cd1364e21594 (patch)
tree72ce1044f1b3bafc2fc2e15978985dfbc0126c73 /include/cppuhelper/unourl.hxx
parenttdf#88810 avoid unnecessary massive O(U)String allocations in XLSX export (diff)
downloadcore-0866023fafe4665f488eaea65a32cd1364e21594.tar.gz
core-0866023fafe4665f488eaea65a32cd1364e21594.zip
Get rid of std::auto_ptr in stable URE interface
...the deprecation-warning noise is getting ever louder, and eventually auto_ptr will just disappear. Just surrender and use good-old plain pointer and deletion in dtor---it's probably the best to do in this stable interface. The change is backwards compatible. For one, in all relevant standard libraries (libstdc++, even in debug mode; libc++; msvcrt) sizeof(auto_ptr<T>) equals sizeof(T*). And for another, the removed UnoUrlDescriptor ctor was only called from within cppuhelper and had deliberately been left out of cppuhelper/source/gcc3.map (so isn't exported at least on Linux)---marking it SAL_DLLPRIVATE had probably just been forgotten when retrofitting cppuhelper with CPPUHELPER_DLLPUBLIC annotations. Change-Id: Ic8bce29d93938f2b2e0a264baee85132668e1294
Diffstat (limited to 'include/cppuhelper/unourl.hxx')
-rw-r--r--include/cppuhelper/unourl.hxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx
index 992870985617..64608b134d17 100644
--- a/include/cppuhelper/unourl.hxx
+++ b/include/cppuhelper/unourl.hxx
@@ -20,7 +20,8 @@
#ifndef INCLUDED_CPPUHELPER_UNOURL_HXX
#define INCLUDED_CPPUHELPER_UNOURL_HXX
-#include <memory>
+#include <sal/config.h>
+
#include <cppuhelper/cppuhelperdllapi.h>
namespace rtl { class OUString; }
@@ -49,10 +50,6 @@ public:
*/
explicit UnoUrlDescriptor(rtl::OUString const & rDescriptor);
- /// @cond INTERNAL
- explicit UnoUrlDescriptor(std::auto_ptr< Impl > & rImpl);
- /// @endcond
-
UnoUrlDescriptor(UnoUrlDescriptor const & rOther);
~UnoUrlDescriptor();
@@ -98,7 +95,7 @@ public:
rtl::OUString getParameter(rtl::OUString const & rKey) const;
private:
- std::auto_ptr< Impl > m_xImpl;
+ Impl * m_pImpl;
};
/** Parse UNO URLs into their components.
@@ -175,7 +172,7 @@ public:
private:
class Impl;
- std::auto_ptr< Impl > m_xImpl;
+ Impl * m_pImpl;
};
}