diff options
| -rw-r--r-- | mojo/embedder/simple_platform_shared_buffer_posix.cc | 5 | ||||
| -rw-r--r-- | mojo/embedder/simple_platform_shared_buffer_win.cc | 5 | ||||
| -rw-r--r-- | mojo/embedder/test_embedder.cc | 2 | ||||
| -rw-r--r-- | mojo/system/core_test_base.cc | 3 | ||||
| -rw-r--r-- | mojo/system/raw_channel_posix.cc | 2 | ||||
| -rw-r--r-- | mojo/system/raw_channel_win.cc | 2 |
6 files changed, 11 insertions, 8 deletions
diff --git a/mojo/embedder/simple_platform_shared_buffer_posix.cc b/mojo/embedder/simple_platform_shared_buffer_posix.cc index 89898a8..f6af3f5 100644 --- a/mojo/embedder/simple_platform_shared_buffer_posix.cc +++ b/mojo/embedder/simple_platform_shared_buffer_posix.cc @@ -141,8 +141,9 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( } void* base = static_cast<char*>(real_base) + offset_rounding; - return make_scoped_ptr(new SimplePlatformSharedBufferMapping( - base, length, real_base, real_length)); + return scoped_ptr<PlatformSharedBufferMapping>( + new SimplePlatformSharedBufferMapping( + base, length, real_base, real_length)); } // SimplePlatformSharedBufferMapping ------------------------------------------- diff --git a/mojo/embedder/simple_platform_shared_buffer_win.cc b/mojo/embedder/simple_platform_shared_buffer_win.cc index 73a4d6f..9736780 100644 --- a/mojo/embedder/simple_platform_shared_buffer_win.cc +++ b/mojo/embedder/simple_platform_shared_buffer_win.cc @@ -79,8 +79,9 @@ scoped_ptr<PlatformSharedBufferMapping> SimplePlatformSharedBuffer::MapImpl( } void* base = static_cast<char*>(real_base) + offset_rounding; - return make_scoped_ptr(new SimplePlatformSharedBufferMapping( - base, length, real_base, real_length)); + return scoped_ptr<PlatformSharedBufferMapping>( + new SimplePlatformSharedBufferMapping( + base, length, real_base, real_length)); } // SimplePlatformSharedBufferMapping ------------------------------------------- diff --git a/mojo/embedder/test_embedder.cc b/mojo/embedder/test_embedder.cc index 6d93fef..f388423 100644 --- a/mojo/embedder/test_embedder.cc +++ b/mojo/embedder/test_embedder.cc @@ -42,7 +42,7 @@ namespace embedder { namespace test { void InitWithSimplePlatformSupport() { - Init(make_scoped_ptr(new SimplePlatformSupport())); + Init(scoped_ptr<PlatformSupport>(new SimplePlatformSupport())); } bool Shutdown() { diff --git a/mojo/system/core_test_base.cc b/mojo/system/core_test_base.cc index 1cae08f..6fe3a70 100644 --- a/mojo/system/core_test_base.cc +++ b/mojo/system/core_test_base.cc @@ -175,7 +175,8 @@ CoreTestBase::~CoreTestBase() { } void CoreTestBase::SetUp() { - core_ = new Core(make_scoped_ptr(new embedder::SimplePlatformSupport())); + core_ = new Core(scoped_ptr<embedder::PlatformSupport>( + new embedder::SimplePlatformSupport())); } void CoreTestBase::TearDown() { diff --git a/mojo/system/raw_channel_posix.cc b/mojo/system/raw_channel_posix.cc index 651a4a1..6ee8594 100644 --- a/mojo/system/raw_channel_posix.cc +++ b/mojo/system/raw_channel_posix.cc @@ -479,7 +479,7 @@ void RawChannelPosix::WaitToWrite() { // static scoped_ptr<RawChannel> RawChannel::Create( embedder::ScopedPlatformHandle handle) { - return make_scoped_ptr(new RawChannelPosix(handle.Pass())); + return scoped_ptr<RawChannel>(new RawChannelPosix(handle.Pass())); } } // namespace system diff --git a/mojo/system/raw_channel_win.cc b/mojo/system/raw_channel_win.cc index 1a054b9..99e674f 100644 --- a/mojo/system/raw_channel_win.cc +++ b/mojo/system/raw_channel_win.cc @@ -573,7 +573,7 @@ void RawChannelWin::OnShutdownNoLock(scoped_ptr<ReadBuffer> read_buffer, // static scoped_ptr<RawChannel> RawChannel::Create( embedder::ScopedPlatformHandle handle) { - return make_scoped_ptr(new RawChannelWin(handle.Pass())); + return scoped_ptr<RawChannel>(new RawChannelWin(handle.Pass())); } } // namespace system |