From b3731da68f0fc75e78e5fd61316b41ccca574094 Mon Sep 17 00:00:00 2001 From: "andrew@webrtc.org" Date: Thu, 24 Oct 2013 15:16:53 +0000 Subject: [PATCH] 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 | 6 +++--- webrtc/system_wrappers/{interface => source}/move.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename webrtc/system_wrappers/{interface => source}/move.h (99%) diff --git a/webrtc/system_wrappers/interface/scoped_ptr.h b/webrtc/system_wrappers/interface/scoped_ptr.h index a2a1b44ea8..cd9daf2225 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 @@ class scoped_ptr_impl { // types. template > 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 @@ class scoped_ptr { template 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. diff --git a/webrtc/system_wrappers/interface/move.h b/webrtc/system_wrappers/source/move.h similarity index 99% rename from webrtc/system_wrappers/interface/move.h rename to webrtc/system_wrappers/source/move.h index d828c32a94..53109c73ad 100644 --- a/webrtc/system_wrappers/interface/move.h +++ b/webrtc/system_wrappers/source/move.h @@ -199,7 +199,7 @@ // // The workaround is to explicitly declare your copy constructor. // -#define MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \ +#define WEBRTC_MOVE_ONLY_TYPE_FOR_CPP_03(type, rvalue_type) \ private: \ struct rvalue_type { \ explicit rvalue_type(type* object) : object(object) {} \