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

Unified Diff: webrtc/base/stringutils.h

Issue 2718663005: Replace NULL with nullptr or null in webrtc/base/. (Closed)
Patch Set: Fixing Windows and formatting issues. Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/stringencode_unittest.cc ('k') | webrtc/base/stringutils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/stringutils.h
diff --git a/webrtc/base/stringutils.h b/webrtc/base/stringutils.h
index de256581d75707d932980ca749bc62be61c6ef87..4c241f02ded2e648ab4699d8b2cf5cc0600b5f73 100644
--- a/webrtc/base/stringutils.h
+++ b/webrtc/base/stringutils.h
@@ -136,8 +136,8 @@ struct Traits {
// String utilities which work with char or wchar_t
///////////////////////////////////////////////////////////////////////////////
-template<class CTYPE>
-inline const CTYPE* nonnull(const CTYPE* str, const CTYPE* def_str = NULL) {
+template <class CTYPE>
+inline const CTYPE* nonnull(const CTYPE* str, const CTYPE* def_str = nullptr) {
return str ? str : (def_str ? def_str : Traits<CTYPE>::empty_str());
}
« no previous file with comments | « webrtc/base/stringencode_unittest.cc ('k') | webrtc/base/stringutils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698