From e5e5d54e37163af332689f43aa293b48012287f2 Mon Sep 17 00:00:00 2001 From: "mikhal@webrtc.org" Date: Thu, 13 Oct 2011 22:40:44 +0000 Subject: [PATCH] libyuv: Removing constructor_magic Review URL: http://webrtc-codereview.appspot.com/229002 git-svn-id: http://libyuv.googlecode.com/svn/trunk@26 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- common/basic_types.h | 2 -- common/constructor_magic.h | 39 -------------------------------------- 2 files changed, 41 deletions(-) delete mode 100644 common/constructor_magic.h diff --git a/common/basic_types.h b/common/basic_types.h index a5e921847..a553a3961 100644 --- a/common/basic_types.h +++ b/common/basic_types.h @@ -21,8 +21,6 @@ #include "config.h" #endif -#include "constructor_magic.h" - #ifndef INT_TYPES_DEFINED #define INT_TYPES_DEFINED diff --git a/common/constructor_magic.h b/common/constructor_magic.h deleted file mode 100644 index 2a5dd1267..000000000 --- a/common/constructor_magic.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2011 The LibYuv project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - - -#ifndef LIBYUV_COMMON_CONSTRUCTOR_MAGIC_H_ -#define LIBYUV_COMMON_CONSTRUCTOR_MAGIC_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) - -// Alternative, less-accurate legacy name. -#define DISALLOW_EVIL_CONSTRUCTORS(TypeName) \ - DISALLOW_COPY_AND_ASSIGN(TypeName) - -// A macro to disallow all the implicit constructors, namely the -// default constructor, copy constructor and operator= functions. -// -// This should be used in the private: declarations for a class -// that wants to prevent anyone from instantiating it. This is -// especially useful for classes containing only static methods. -#define DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ - TypeName(); \ - DISALLOW_EVIL_CONSTRUCTORS(TypeName) - - -#endif // LIBYUV_COMMON_CONSTRUCTOR_MAGIC_H_