Fix move.h's to use a concrete RValue carrier object rather than hacking a RValue&.

base/memory/scoped_ptr.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Scopers help you manage ownership of a pointer, helping you easily manage the
 // a pointer within a scope, and automatically destroying the pointer at the
 // end of a scope.  There are two main classes you will use, which correspond
 // to the operators new/delete and new[]/delete[].
 //
 // Example usage (scoped_ptr):
@@ skipping 36 matching lines @@
 //   scoped_ptr<Foo> CreateFoo() {
 //     // No need for calling Pass() because we are constructing a temporary
 //     // for the return value.
 //     return scoped_ptr<Foo>(new Foo("new"));
 //   }
 //   scoped_ptr<Foo> PassThru(scoped_ptr<Foo> arg) {
 //     return arg.Pass();
 //   }
 //
 //   {
-//     scoped_ptr<Foo> ptr(new Foo("yay"));  // ptr manages Foo("yay)"
+//     scoped_ptr<Foo> ptr(new Foo("yay"));  // ptr manages Foo("yay").
 //     TakesOwnership(ptr.Pass());           // ptr no longer owns Foo("yay").
 //     scoped_ptr<Foo> ptr2 = CreateFoo();   // ptr2 owns the return Foo.
 //     scoped_ptr<Foo> ptr3 =                // ptr3 now owns what was in ptr2.
 //         PassThru(ptr2.Pass());            // ptr2 is correspondingly NULL.
 //   }
 //
 // Notice that if you do not call Pass() when returning from PassThru(), or
 // when invoking TakesOwnership(), the code will not compile because scopers
 // are not copyable; they only implement move semantics which require calling
 // the Pass() function to signify a destructive transfer of state. CreateFoo()
@@ skipping 77 matching lines @@
   // There is no way to create an uninitialized scoped_ptr.
   // The input parameter must be allocated with new.
   explicit scoped_ptr(C* p = NULL) : ptr_(p) { }
 
   // Constructor.  Allows construction from a scoped_ptr rvalue for a
   // convertible type.
   template <typename U>
   scoped_ptr(scoped_ptr<U> other) : ptr_(other.release()) { }
 
   // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_ptr(RValue& other)
-      // The type of the underlying object is scoped_ptr; we have to
-      // reinterpret_cast back to the original type for the call to release to
-      // be valid. (See C++11 5.2.10.7)
-      : ptr_(reinterpret_cast<scoped_ptr&>(other).release()) {
+  scoped_ptr(RValue rvalue)
+      : ptr_(rvalue.object->release()) {
   }
 
   // Destructor.  If there is a C object, delete it.
   // We don't need to test ptr_ == NULL because C++ does that for us.
   ~scoped_ptr() {
     enum { type_must_be_complete = sizeof(C) };
     delete ptr_;
   }
 
   // operator=.  Allows assignment from a scoped_ptr rvalue for a convertible
   // type.
   template <typename U>
   scoped_ptr& operator=(scoped_ptr<U> rhs) {
     reset(rhs.release());
     return *this;
   }
 
   // operator=.  Move operator= for C++03 move emulation of this type.
-  scoped_ptr& operator=(RValue& rhs) {
-    swap(rhs);
+  scoped_ptr& operator=(RValue rhs) {
+    swap(*rhs->object);
     return *this;
   }
 
   // Reset.  Deletes the current owned object, if any.
   // Then takes ownership of a new object, if given.
   // this->reset(this->get()) works.
   void reset(C* p = NULL) {
     if (p != ptr_) {
       enum { type_must_be_complete = sizeof(C) };
       delete ptr_;
@@ skipping 91 matching lines @@
 
   // The element type
   typedef C element_type;
 
   // Constructor.  Defaults to initializing with NULL.
   // There is no way to create an uninitialized scoped_array.
   // The input parameter must be allocated with new [].
   explicit scoped_array(C* p = NULL) : array_(p) { }
 
   // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_array(RValue& other)
-      // The type of the underlying object is scoped_array; we have to
-      // reinterpret_cast back to the original type for the call to release to
-      // be valid. (See C++11 5.2.10.7)
-      : array_(reinterpret_cast<scoped_array&>(other).release()) {
+  scoped_array(RValue rvalue)
+      : array_(rvalue.object->release()) {
   }
 
   // Destructor.  If there is a C object, delete it.
   // We don't need to test ptr_ == NULL because C++ does that for us.
   ~scoped_array() {
     enum { type_must_be_complete = sizeof(C) };
     delete[] array_;
   }
 
   // operator=.  Move operator= for C++03 move emulation of this type.
-  scoped_array& operator=(RValue& rhs) {
-    swap(rhs);
+  scoped_array& operator=(RValue rhs) {
+    swap(*rhs.object);
     return *this;
   }
 
   // Reset.  Deletes the current owned object, if any.
   // Then takes ownership of a new object, if given.
   // this->reset(this->get()) works.
   void reset(C* p = NULL) {
     if (p != array_) {
       enum { type_must_be_complete = sizeof(C) };
       delete[] array_;
@@ skipping 90 matching lines @@
   typedef C element_type;
 
   // Constructor.  Defaults to initializing with NULL.
   // There is no way to create an uninitialized scoped_ptr.
   // The input parameter must be allocated with an allocator that matches the
   // Free functor.  For the default Free functor, this is malloc, calloc, or
   // realloc.
   explicit scoped_ptr_malloc(C* p = NULL): ptr_(p) {}
 
   // Constructor.  Move constructor for C++03 move emulation of this type.
-  scoped_ptr_malloc(RValue& other)
-      // The type of the underlying object is scoped_ptr_malloc; we have to
-      // reinterpret_cast back to the original type for the call to release to
-      // be valid. (See C++11 5.2.10.7)
-      : ptr_(reinterpret_cast<scoped_ptr_malloc&>(other).release()) {
+  scoped_ptr_malloc(RValue rvalue)
+      : ptr_(rvalue.object->release()) {
   }
 
   // Destructor.  If there is a C object, call the Free functor.
   ~scoped_ptr_malloc() {
     reset();
   }
 
   // operator=.  Move operator= for C++03 move emulation of this type.
-  scoped_ptr_malloc& operator=(RValue& rhs) {
-    swap(rhs);
+  scoped_ptr_malloc& operator=(RValue rhs) {
+    swap(*rhs.object);
     return *this;
   }
 
   // Reset.  Calls the Free functor on the current owned object, if any.
   // Then takes ownership of a new object, if given.
   // this->reset(this->get()) works.
   void reset(C* p = NULL) {
     if (ptr_ != p) {
       FreeProc free_proc;
       free_proc(ptr_);
@@ skipping 81 matching lines @@
 
 // A function to convert T* into scoped_ptr<T>
 // Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
 // for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
 template <typename T>
 scoped_ptr<T> make_scoped_ptr(T* ptr) {
   return scoped_ptr<T>(ptr);
 }
 
 #endif  // BASE_MEMORY_SCOPED_PTR_H_