diff -up libjingle-0.6.6/talk/base/basictypes.h.fixconflict libjingle-0.6.6/talk/base/basictypes.h diff -up libjingle-0.6.6/talk/base/constructormagic.h.fixconflict libjingle-0.6.6/talk/base/constructormagic.h --- libjingle-0.6.6/talk/base/constructormagic.h.fixconflict 2011-12-14 10:58:28.000000000 -0500 +++ libjingle-0.6.6/talk/base/constructormagic.h 2012-01-05 13:32:07.109312351 -0500 @@ -28,14 +28,11 @@ #ifndef TALK_BASE_CONSTRUCTORMAGIC_H_ #define TALK_BASE_CONSTRUCTORMAGIC_H_ -#define DISALLOW_ASSIGN(TypeName) \ - void operator=(const TypeName&) - // A macro to disallow the evil copy constructor and operator= functions // This should be used in the private: declarations for a class #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName&); \ - DISALLOW_ASSIGN(TypeName) + void operator=(const TypeName&) // Alternative, less-accurate legacy name. #define DISALLOW_EVIL_CONSTRUCTORS(TypeName) \ @@ -49,7 +46,7 @@ // especially useful for classes containing only static methods. #define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ TypeName(); \ - DISALLOW_EVIL_CONSTRUCTORS(TypeName) + DISALLOW_COPY_AND_ASSIGN(TypeName) #endif // TALK_BASE_CONSTRUCTORMAGIC_H_