Replace NULL with nullptr or null in webrtc/base/.
BUG=webrtc:7147 Review-Url: https://codereview.webrtc.org/2718663005 Cr-Commit-Position: refs/heads/master@{#16878}
This commit is contained in:
@ -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());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user