Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Side by Side Diff: webrtc/base/constructormagic.h

Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « talk/media/base/streamparams.h ('k') | webrtc/base/logging.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_BASE_CONSTRUCTORMAGIC_H_ 11 #ifndef WEBRTC_BASE_CONSTRUCTORMAGIC_H_
12 #define WEBRTC_BASE_CONSTRUCTORMAGIC_H_ 12 #define WEBRTC_BASE_CONSTRUCTORMAGIC_H_
13 13
14 // Put this in the declarations for a class to be unassignable.
14 #define RTC_DISALLOW_ASSIGN(TypeName) \ 15 #define RTC_DISALLOW_ASSIGN(TypeName) \
15 void operator=(const TypeName&) 16 void operator=(const TypeName&) = delete
16 17
17 // A macro to disallow the evil copy constructor and operator= functions 18 // A macro to disallow the copy constructor and operator= functions. This should
18 // This should be used in the private: declarations for a class. 19 // be used in the declarations for a class.
19 #define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \ 20 #define RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) \
20 TypeName(const TypeName&); \ 21 TypeName(const TypeName&) = delete; \
21 RTC_DISALLOW_ASSIGN(TypeName) 22 RTC_DISALLOW_ASSIGN(TypeName)
22 23
23 // A macro to disallow all the implicit constructors, namely the 24 // A macro to disallow all the implicit constructors, namely the default
24 // default constructor, copy constructor and operator= functions. 25 // constructor, copy constructor and operator= functions.
25 // 26 //
26 // This should be used in the private: declarations for a class 27 // This should be used in the declarations for a class that wants to prevent
27 // that wants to prevent anyone from instantiating it. This is 28 // anyone from instantiating it. This is especially useful for classes
28 // especially useful for classes containing only static methods. 29 // containing only static methods.
29 #define RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \ 30 #define RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(TypeName) \
30 TypeName(); \ 31 TypeName() = delete; \
31 RTC_DISALLOW_COPY_AND_ASSIGN(TypeName) 32 RTC_DISALLOW_COPY_AND_ASSIGN(TypeName)
32 33
33 #endif // WEBRTC_BASE_CONSTRUCTORMAGIC_H_ 34 #endif // WEBRTC_BASE_CONSTRUCTORMAGIC_H_
OLDNEW
« no previous file with comments | « talk/media/base/streamparams.h ('k') | webrtc/base/logging.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698