generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prefix MOVE_ONLY_TYPE_FOR_CPP_03 with WEBRTC_.

Browse Source 
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
This commit is contained in:
andrew@webrtc.org 2013-10-24 15:16:53 +00:00
parent b56d0e383e
commit b3731da68f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/system_wrappers/interface/scoped_ptr.h
View File

@ -106,8 +106,8 @@
#include "webrtc/system_wrappers/interface/compile_assert.h" #include "webrtc/system_wrappers/interface/compile_assert.h"
#include "webrtc/system_wrappers/interface/constructor_magic.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/interface/template_util.h"
#include "webrtc/system_wrappers/source/move.h"
#include "webrtc/typedefs.h" #include "webrtc/typedefs.h"
namespace webrtc { namespace webrtc {
@ -302,7 +302,7 @@ class scoped_ptr_impl {
// types. // types.
template <class T, class D = webrtc::DefaultDeleter<T> > template <class T, class D = webrtc::DefaultDeleter<T> >
class scoped_ptr { class scoped_ptr {
MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue) WEBRTC_MOVE_ONLY_TYPE_FOR_CPP_03(scoped_ptr, RValue)
public: public:
// The element and deleter types. // The element and deleter types.
@ -436,7 +436,7 @@ class scoped_ptr {
template <class T, class D> template <class T, class D>
class scoped_ptr<T[], 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: public:
// The element and deleter types. // The element and deleter types.

2
webrtc/system_wrappers/interface/move.h → webrtc/system_wrappers/source/move.h
View File

@ -199,7 +199,7 @@
// //
// The workaround is to explicitly declare your copy constructor. // 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: \ private: \
struct rvalue_type { \ struct rvalue_type { \
explicit rvalue_type(type* object) : object(object) {} \ explicit rvalue_type(type* object) : object(object) {} \