diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-19 16:49:03 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-05-19 22:27:39 -0700 |
| commit | 700a402244a1a423da4f3ba8032459f4b65fa18f (patch) | |
| tree | 4c22fcda04d271bd55a37aff30650214af17a90c /compiler/output_stream_test.cc | |
| parent | 047c11adcbcbc0bcf210defdfcbada763961ffee (diff) | |
| download | art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.gz art-700a402244a1a423da4f3ba8032459f4b65fa18f.tar.bz2 art-700a402244a1a423da4f3ba8032459f4b65fa18f.zip | |
Now we have a proper C++ library, use std::unique_ptr.
Also remove the Android.libcxx.mk and other bits of stlport compatibility
mechanics.
Change-Id: Icdf7188ba3c79cdf5617672c1cfd0a68ae596a61
Diffstat (limited to 'compiler/output_stream_test.cc')
| -rw-r--r-- | compiler/output_stream_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/output_stream_test.cc b/compiler/output_stream_test.cc index 290bf2519d..5fa0ccb143 100644 --- a/compiler/output_stream_test.cc +++ b/compiler/output_stream_test.cc @@ -64,7 +64,7 @@ TEST_F(OutputStreamTest, File) { FileOutputStream output_stream(tmp.GetFile()); SetOutputStream(output_stream); GenerateTestOutput(); - UniquePtr<File> in(OS::OpenFileForReading(tmp.GetFilename().c_str())); + std::unique_ptr<File> in(OS::OpenFileForReading(tmp.GetFilename().c_str())); EXPECT_TRUE(in.get() != NULL); std::vector<uint8_t> actual(in->GetLength()); bool readSuccess = in->ReadFully(&actual[0], actual.size()); @@ -74,12 +74,12 @@ TEST_F(OutputStreamTest, File) { TEST_F(OutputStreamTest, Buffered) { ScratchFile tmp; - UniquePtr<FileOutputStream> file_output_stream(new FileOutputStream(tmp.GetFile())); + std::unique_ptr<FileOutputStream> file_output_stream(new FileOutputStream(tmp.GetFile())); CHECK(file_output_stream.get() != NULL); BufferedOutputStream buffered_output_stream(file_output_stream.release()); SetOutputStream(buffered_output_stream); GenerateTestOutput(); - UniquePtr<File> in(OS::OpenFileForReading(tmp.GetFilename().c_str())); + std::unique_ptr<File> in(OS::OpenFileForReading(tmp.GetFilename().c_str())); EXPECT_TRUE(in.get() != NULL); std::vector<uint8_t> actual(in->GetLength()); bool readSuccess = in->ReadFully(&actual[0], actual.size()); |