commit b3731da68f0fc75e78e5fd61316b41ccca574094
author andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Oct 24 15:16:53 2013 +0000
committer andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Oct 24 15:16:53 2013 +0000
tree af65724f8722459f8fc4769a7ae3e393f0b6cc28
parent b56d0e383e62f74651aa78b9c2857e1b57a8729b

Prefix MOVE_ONLY_TYPE_FOR_CPP_03 with WEBRTC_.

Will fix a redefinition error in Chromium against webrtc head.

TESTED=trybots
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2869004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5029 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/system_wrappers/interface/scoped_ptr.h

diff --git a/webrtc/system_wrappers/interface/scoped_ptr.h b/webrtc/system_wrappers/interface/scoped_ptr.h
index a2a1b44..cd9daf2 100644
--- a/webrtc/system_wrappers/interface/scoped_ptr.h
+++ b/webrtc/system_wrappers/interface/scoped_ptr.h
@@ -106,8 +106,8 @@
 
 #include "webrtc/system_wrappers/interface/compile_assert.h"
 #include "webrtc/system_wrappers/interface/constructor_magic.h"
-#include "webrtc/system_wrappers/interface/move.h"
 #include "webrtc/system_wrappers/interface/template_util.h"
+#include "webrtc/system_wrappers/source/move.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -302,7 +302,7 @@
 // types.
 template <class T, class D = webrtc::DefaultDeleter<T> >
 class scoped_ptr {
-  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+  WEBRTC_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
 
  public:
   // The element and deleter types.
@@ -436,7 +436,7 @@
 
 template <class T, class D>
 class scoped_ptr<T[], D> {
-  MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
+  WEBRTC_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
 
  public:
   // The element and deleter types.