diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:00:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-22 15:01:05 +0100 |
| commit | 871426533f7afe31bc451fa6b407b83db8e52827 (patch) | |
| tree | ed60cee61ebee91994eaffc9c9a3638836ed2ab4 /cppuhelper | |
| parent | 5a849bb5317ad73bb43b2b618b14bc0e8751fff6 (diff) | |
just silence the auto_ptr deprecations in isolation
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/source/unourl.cxx | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx index eff9f8a0be2a..a30cbc5dc74b 100644 --- a/cppuhelper/source/unourl.cxx +++ b/cppuhelper/source/unourl.cxx @@ -157,9 +157,11 @@ UnoUrlDescriptor::UnoUrlDescriptor(rtl::OUString const & rDescriptor): m_xImpl(new Impl(rDescriptor)) {} +SAL_WNODEPRECATED_DECLARATIONS_PUSH UnoUrlDescriptor::UnoUrlDescriptor(std::auto_ptr< Impl > & rImpl): m_xImpl(rImpl) {} +SAL_WNODEPRECATED_DECLARATIONS_POP UnoUrlDescriptor::UnoUrlDescriptor(UnoUrlDescriptor const & rOther): m_xImpl(rOther.m_xImpl->clone()) @@ -211,19 +213,17 @@ public: static inline Impl * create(rtl::OUString const & rUrl); private: - inline Impl(std::auto_ptr< UnoUrlDescriptor::Impl > & rConnection, - std::auto_ptr< UnoUrlDescriptor::Impl > & rProtocol, - rtl::OUString const & rObjectName); +SAL_WNODEPRECATED_DECLARATIONS_PUSH + Impl(std::auto_ptr< UnoUrlDescriptor::Impl > & rConnection, + std::auto_ptr< UnoUrlDescriptor::Impl > & rProtocol, + rtl::OUString const & rObjectName): + m_aConnection(rConnection), + m_aProtocol(rProtocol), + m_aObjectName(rObjectName) + {} +SAL_WNODEPRECATED_DECLARATIONS_POP }; -inline UnoUrl::Impl::Impl(std::auto_ptr< UnoUrlDescriptor::Impl > & rConnection, - std::auto_ptr< UnoUrlDescriptor::Impl > & rProtocol, - rtl::OUString const & rObjectName): - m_aConnection(rConnection), - m_aProtocol(rProtocol), - m_aObjectName(rObjectName) -{} - inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) { if (!rUrl.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("uno:"), 0)) @@ -236,16 +236,20 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl) throw rtl::MalformedUriException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UNO URL has too few semicolons"))); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< UnoUrlDescriptor::Impl > xConnection(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i))); + SAL_WNODEPRECATED_DECLARATIONS_POP i = j + 1; j = rUrl.indexOf(0x3B, i); // ';' if (j < 0) throw rtl::MalformedUriException( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UNO URL has too few semicolons"))); + SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< UnoUrlDescriptor::Impl > xProtocol(new UnoUrlDescriptor::Impl(rUrl.copy(i, j - i))); + SAL_WNODEPRECATED_DECLARATIONS_POP i = j + 1; if (i == rUrl.getLength()) throw rtl::MalformedUriException( |