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

Side by Side Diff: core/fxcrt/include/fx_system.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: s/NULL/nullptr/ Created 4 years, 6 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
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #ifndef CORE_FXCRT_INCLUDE_FX_SYSTEM_H_ 7 #ifndef CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
8 #define CORE_FXCRT_INCLUDE_FX_SYSTEM_H_ 8 #define CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
9 9
10 #include <assert.h> 10 #include <assert.h>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 #ifndef FALSE 85 #ifndef FALSE
86 #define FALSE 0 86 #define FALSE 0
87 #endif 87 #endif
88 88
89 #ifdef __cplusplus 89 #ifdef __cplusplus
90 static_assert(TRUE == true, "true_needs_to_be_true"); 90 static_assert(TRUE == true, "true_needs_to_be_true");
91 static_assert(FALSE == false, "false_needs_to_be_false"); 91 static_assert(FALSE == false, "false_needs_to_be_false");
92 #endif 92 #endif
93 93
94 #ifndef NULL 94 #ifndef nullptr
Tom Sepez 2016/06/02 20:09:49 Let's not do this. Let's keep it NULL for things
Lei Zhang 2016/06/07 07:33:24 I ended up removing this in one of the later patch
95 #define NULL 0 95 #define nullptr 0
96 #endif 96 #endif
97 97
98 #ifndef ASSERT 98 #ifndef ASSERT
99 #ifndef NDEBUG 99 #ifndef NDEBUG
100 #define ASSERT assert 100 #define ASSERT assert
101 #else 101 #else
102 #define ASSERT(a) 102 #define ASSERT(a)
103 #endif 103 #endif
104 #endif 104 #endif
105 105
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 332
333 // Prevent a function from ever being inlined, typically because we'd 333 // Prevent a function from ever being inlined, typically because we'd
334 // like it to appear in stack traces. 334 // like it to appear in stack traces.
335 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 335 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
336 #define NEVER_INLINE __declspec(noinline) 336 #define NEVER_INLINE __declspec(noinline)
337 #else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 337 #else // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
338 #define NEVER_INLINE __attribute__((__noinline__)) 338 #define NEVER_INLINE __attribute__((__noinline__))
339 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_ 339 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
340 340
341 #endif // CORE_FXCRT_INCLUDE_FX_SYSTEM_H_ 341 #endif // CORE_FXCRT_INCLUDE_FX_SYSTEM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698