diff options
| author | dcheng <dcheng@chromium.org> | 2015-11-18 23:00:20 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-19 07:01:23 +0000 |
| commit | 0917ec4328dc20b59887d78f76b9f075e12e5f7f (patch) | |
| tree | e2e24def30f3b6619eb1b92d570b055bfcef9672 /sql | |
| parent | d076ca806251e4b636b421eb46ca04d14366b2cc (diff) | |
| download | chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.zip chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.gz chromium_src-0917ec4328dc20b59887d78f76b9f075e12e5f7f.tar.bz2 | |
Use std::default_delete as the default deleter for scoped_ptr.
The aim is to make scoped_ptr and std::unique_ptr functionally
identical so scoped_ptr can simply be a typedef.
BUG=554298
Review URL: https://codereview.chromium.org/1445003002
Cr-Commit-Position: refs/heads/master@{#360539}
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mojo/vfs_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index 123299b..33c6171 100644 --- a/sql/mojo/vfs_unittest.cc +++ b/sql/mojo/vfs_unittest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <memory> + #include "components/filesystem/public/interfaces/file_system.mojom.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/application/public/cpp/application_test_base.h" @@ -10,12 +12,12 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/sqlite/sqlite3.h" -namespace base { +namespace std { // This deleter lets us be safe with sqlite3 objects, which aren't really the // structs, but slabs of new uint8_t[size]. template <> -struct DefaultDeleter<sqlite3_file> { +struct default_delete<sqlite3_file> { inline void operator()(sqlite3_file* ptr) const { // Why don't we call file->pMethods->xClose() here? Because it's not // guaranteed to be valid. sqlite3_file "objects" can be in partially @@ -24,7 +26,7 @@ struct DefaultDeleter<sqlite3_file> { } }; -} // namespace base +} // namespace std namespace sql { |