Skip to content
This repository was archived by the owner on Jun 30, 2025. It is now read-only.

Adds CHECK support for nullptr. (fixes #341) #342

Closed
bretmckee wants to merge 2 commits into from
Closed

Adds CHECK support for nullptr. (fixes #341) #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2cf2e1
Adds CHECK support for nullptr. (fixes #341)
bretmckee Jul 4, 2018
c1611bc
Adds version checking for the nullptr code.
bretmckee Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ Abhishek Dasgupta <abhi2743@gmail.com>
Abhishek Parmar <abhishek@orng.net>
Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Andy Ying <andy@trailofbits.com>
Bret McKee <bretmckee@google.com>
Brian Silverman <bsilver16384@gmail.com>
Fumitoshi Ukai <ukai@google.com>
Guillaume Dumont <dumont.guillaume@gmail.com>
Expand Down
7 changes: 7 additions & 0 deletions src/glog/logging.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,13 @@ void MakeCheckOpValueString(std::ostream* os, const signed char& v);
template <> GOOGLE_GLOG_DLL_DECL
void MakeCheckOpValueString(std::ostream* os, const unsigned char& v);

// This is required because nullptr is only present in c++ 11 and later.
#if __cplusplus >= 201103L
Copy link
Contributor

@sergiud sergiud Oct 31, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, this check is unreliable (e.g., under MSVC). Instead, you should test for std::nullptr_t using CMake and CheckCXXSymbolExists and provide a define (e.g., HAVE_NULLPTR_T) that is eventually used here. The __cplusplus check can be left as a backup.

Copy link

@maingoh maingoh Jan 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about doing like in tensorflow ?
https://github.com/tensorflow/tensorflow/blob/590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b/tensorflow/core/platform/macros.h#L108
https://github.com/tensorflow/tensorflow/blob/590d6eef7e91a6a7392c8ffffb7b58f2e0c8bc6b/tensorflow/core/platform/default/logging.h#L171

Copy link
Contributor

@sergiud sergiud Jan 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be used as fallback. The actual check should be performed by the build system as previously explained.

// Provide printable value for nullptr_t
template <> GOOGLE_GLOG_DLL_DECL
void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v);
#endif

// Build the error message string. Specify no inlining for code size.
template <typename T1, typename T2>
std::string* MakeCheckOpString(const T1& v1, const T2& v2, const char* exprtext)
Expand Down
7 changes: 7 additions & 0 deletions src/logging.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2163,6 +2163,13 @@ void MakeCheckOpValueString(std::ostream* os, const unsigned char& v) {
}
}

#if __cplusplus >= 201103L
template <>
void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v) {
(*os) << "nullptr";
}
#endif

void InitGoogleLogging(const char* argv0) {
glog_internal_namespace_::InitGoogleLoggingUtilities(argv0);
}
Expand Down