diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 12:28:26 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-30 12:28:54 +0200 |
| commit | 2d7b5dd5f943a898fec190eff565639245a9c14b (patch) | |
| tree | 7b5b132f0d60f46d9ec212097ae8a9ebe1a5d6b7 /registry/source | |
| parent | 61d048b71bd76eec6a4dbe861646e184b55345ac (diff) | |
registry: std::auto_ptr -> std::unique_ptr
Change-Id: I9489f90a63d477e8802634e7850d3a3fa8e4d133
Diffstat (limited to 'registry/source')
| -rw-r--r-- | registry/source/reflread.cxx | 2 | ||||
| -rw-r--r-- | registry/source/regimpl.cxx | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx index 4245ddf82a50..3f0a994b09fb 100644 --- a/registry/source/reflread.cxx +++ b/registry/source/reflread.cxx @@ -1146,7 +1146,7 @@ REG_DLLPUBLIC sal_Bool TYPEREG_CALLTYPE typereg_reader_create( *result = 0; return true; } - std::auto_ptr< TypeRegistryEntry > entry; + std::unique_ptr< TypeRegistryEntry > entry; try { entry.reset( new TypeRegistryEntry( diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx index f043eef146f8..3d44092892c7 100644 --- a/registry/source/regimpl.cxx +++ b/registry/source/regimpl.cxx @@ -726,9 +726,7 @@ RegError ORegistry::openKey(RegKeyHandle hKey, const OUString& keyName, break; } - SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< ORegKey > p(new ORegKey(path, this)); - SAL_WNODEPRECATED_DECLARATIONS_POP + std::unique_ptr< ORegKey > p(new ORegKey(path, this)); i = m_openKeyTable.insert(std::make_pair(path, p.get())).first; p.release(); } else { @@ -905,7 +903,7 @@ RegError ORegistry::loadKey(RegKeyHandle hKey, const OUString& regFileName, RegError _ret = REG_NO_ERROR; ORegKey* pKey = static_cast< ORegKey* >(hKey); - std::auto_ptr< ORegistry > pReg (new ORegistry()); + std::unique_ptr< ORegistry > pReg (new ORegistry()); _ret = pReg->initRegistry(regFileName, REG_READONLY); if (_ret != REG_NO_ERROR) return _ret; @@ -953,9 +951,7 @@ RegError ORegistry::saveKey(RegKeyHandle hKey, const OUString& regFileName, RegError _ret = REG_NO_ERROR; ORegKey* pKey = static_cast< ORegKey* >(hKey); -SAL_WNODEPRECATED_DECLARATIONS_PUSH - std::auto_ptr< ORegistry > pReg (new ORegistry()); -SAL_WNODEPRECATED_DECLARATIONS_POP + std::unique_ptr< ORegistry > pReg (new ORegistry()); _ret = pReg->initRegistry(regFileName, REG_CREATE); if (_ret != REG_NO_ERROR) return _ret; |