AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use scoped_ptr instead of deprecated auto_ptr

Browse Source
This commit is contained in:
vitaut 2015-07-29 07:03:15 -07:00
parent 200037683e
commit d02a5031f0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/posix-mock-test.cc
View File

@ -34,7 +34,6 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <climits> #include <climits>
#include <memory>
#ifdef _WIN32 #ifdef _WIN32
# include <io.h> # include <io.h>
@ -248,7 +247,7 @@ TEST(FileTest, OpenRetry) {
TEST(FileTest, CloseNoRetryInDtor) { TEST(FileTest, CloseNoRetryInDtor) {
File read_end, write_end; File read_end, write_end;
File::pipe(read_end, write_end); File::pipe(read_end, write_end);
std::auto_ptr<File> f(new File(std::move(read_end))); testing::internal::scoped_ptr<File> f(new File(std::move(read_end)));
int saved_close_count = 0; int saved_close_count = 0;
EXPECT_WRITE(stderr, { EXPECT_WRITE(stderr, {
close_count = 1; close_count = 1;

4
test/posix-test.cc
View File

@ -26,7 +26,6 @@
*/ */
#include <cstring> #include <cstring>
#include <memory>
#include "gtest-extra.h" #include "gtest-extra.h"
#include "posix.h" #include "posix.h"
@ -137,7 +136,8 @@ TEST(BufferedFileTest, CloseFileInDtor) {
} }
TEST(BufferedFileTest, CloseErrorInDtor) { TEST(BufferedFileTest, CloseErrorInDtor) {
std::auto_ptr<BufferedFile> f(new BufferedFile(open_buffered_file())); testing::internal::scoped_ptr<BufferedFile> f(
new BufferedFile(open_buffered_file()));
EXPECT_WRITE(stderr, { EXPECT_WRITE(stderr, {
// The close function must be called inside EXPECT_WRITE, otherwise // The close function must be called inside EXPECT_WRITE, otherwise
// the system may recycle closed file descriptor when redirecting the // the system may recycle closed file descriptor when redirecting the