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

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

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 9 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 | « webrtc/base/proxyserver.cc ('k') | webrtc/base/scoped_ref_ptr.h » ('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 2008 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2008 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
(...skipping 25 matching lines...) Expand all
36 class ScopedAutoreleasePool { 36 class ScopedAutoreleasePool {
37 public: 37 public:
38 ScopedAutoreleasePool(); 38 ScopedAutoreleasePool();
39 ~ScopedAutoreleasePool(); 39 ~ScopedAutoreleasePool();
40 40
41 private: 41 private:
42 // Declaring private overrides of new and delete here enforces the "only use 42 // Declaring private overrides of new and delete here enforces the "only use
43 // as a stack object" discipline. 43 // as a stack object" discipline.
44 // 44 //
45 // Note: new is declared as "throw()" to get around a gcc warning about new 45 // Note: new is declared as "throw()" to get around a gcc warning about new
46 // returning NULL, but this method will never get called and therefore will 46 // returning null, but this method will never get called and therefore will
47 // never actually throw any exception. 47 // never actually throw any exception.
48 void* operator new(size_t size) throw() { return NULL; } 48 void* operator new(size_t size) throw() { return nullptr; }
49 void operator delete (void* ptr) {} 49 void operator delete (void* ptr) {}
50 50
51 NSAutoreleasePool* pool_; 51 NSAutoreleasePool* pool_;
52 52
53 RTC_DISALLOW_COPY_AND_ASSIGN(ScopedAutoreleasePool); 53 RTC_DISALLOW_COPY_AND_ASSIGN(ScopedAutoreleasePool);
54 }; 54 };
55 55
56 } // namespace rtc 56 } // namespace rtc
57 57
58 #endif // WEBRTC_MAC 58 #endif // WEBRTC_MAC
59 #endif // WEBRTC_BASE_SCOPED_AUTORELEASE_POOL_H__ 59 #endif // WEBRTC_BASE_SCOPED_AUTORELEASE_POOL_H__
OLDNEW
« no previous file with comments | « webrtc/base/proxyserver.cc ('k') | webrtc/base/scoped_ref_ptr.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698