Update glog to 0.6
PiperOrigin-RevId: 551269455
This commit is contained in:
parent
750f498b14
commit
87b925795d
14
WORKSPACE
14
WORKSPACE
|
@ -157,22 +157,22 @@ http_archive(
|
||||||
# 2020-08-21
|
# 2020-08-21
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "com_github_glog_glog",
|
name = "com_github_glog_glog",
|
||||||
strip_prefix = "glog-0.6.0",
|
strip_prefix = "glog-0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6",
|
||||||
sha256 = "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6",
|
sha256 = "58c9b3b6aaa4dd8b836c0fd8f65d0f941441fb95e27212c5eeb9979cfd3592ab",
|
||||||
urls = [
|
urls = [
|
||||||
"https://github.com/google/glog/archive/v0.6.0.tar.gz",
|
"https://github.com/google/glog/archive/0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6.zip",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
http_archive(
|
http_archive(
|
||||||
name = "com_github_glog_glog_no_gflags",
|
name = "com_github_glog_glog_no_gflags",
|
||||||
strip_prefix = "glog-0.6.0",
|
strip_prefix = "glog-0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6",
|
||||||
sha256 = "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6",
|
sha256 = "58c9b3b6aaa4dd8b836c0fd8f65d0f941441fb95e27212c5eeb9979cfd3592ab",
|
||||||
build_file = "@//third_party:glog_no_gflags.BUILD",
|
build_file = "@//third_party:glog_no_gflags.BUILD",
|
||||||
urls = [
|
urls = [
|
||||||
"https://github.com/google/glog/archive/v0.6.0.tar.gz",
|
"https://github.com/google/glog/archive/0a2e5931bd5ff22fd3bf8999eb8ce776f159cda6.zip",
|
||||||
],
|
],
|
||||||
patches = [
|
patches = [
|
||||||
"@//third_party:com_github_glog_glog.diff",
|
"@//third_party:com_github_glog_glog_9779e5ea6ef59562b030248947f787d1256132ae.diff",
|
||||||
],
|
],
|
||||||
patch_args = [
|
patch_args = [
|
||||||
"-p1",
|
"-p1",
|
||||||
|
|
|
@ -1,8 +1,19 @@
|
||||||
diff --git a/src/logging.cc b/src/logging.cc
|
diff --git a/src/logging.cc b/src/logging.cc
|
||||||
index 4028ccc..483e639 100644
|
index 0b5e6ee..be5a506 100644
|
||||||
--- a/src/logging.cc
|
--- a/src/logging.cc
|
||||||
+++ b/src/logging.cc
|
+++ b/src/logging.cc
|
||||||
@@ -1743,6 +1743,23 @@ ostream& LogMessage::stream() {
|
@@ -67,6 +67,10 @@
|
||||||
|
# include "stacktrace.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifdef __ANDROID__
|
||||||
|
+#include <android/log.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
using std::string;
|
||||||
|
using std::vector;
|
||||||
|
using std::setw;
|
||||||
|
@@ -1279,6 +1283,23 @@ ostream& LogMessage::stream() {
|
||||||
return data_->stream_;
|
return data_->stream_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -26,7 +37,7 @@ index 4028ccc..483e639 100644
|
||||||
// Flush buffered message, called by the destructor, or any other function
|
// Flush buffered message, called by the destructor, or any other function
|
||||||
// that needs to synchronize the log.
|
// that needs to synchronize the log.
|
||||||
void LogMessage::Flush() {
|
void LogMessage::Flush() {
|
||||||
@@ -1779,6 +1796,12 @@ void LogMessage::Flush() {
|
@@ -1313,6 +1334,12 @@ void LogMessage::Flush() {
|
||||||
}
|
}
|
||||||
LogDestination::WaitForSinks(data_);
|
LogDestination::WaitForSinks(data_);
|
||||||
|
|
45
third_party/com_github_glog_glog_f2cf2e1bd040fd15016af53598db0cb9b16a6655.diff
vendored
Normal file
45
third_party/com_github_glog_glog_f2cf2e1bd040fd15016af53598db0cb9b16a6655.diff
vendored
Normal file
|
@ -0,0 +1,45 @@
|
||||||
|
https://github.com/google/glog/pull/342
|
||||||
|
|
||||||
|
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
|
||||||
|
index d63f62d1..aa0dd4a8 100644
|
||||||
|
--- a/CONTRIBUTORS
|
||||||
|
+++ b/CONTRIBUTORS
|
||||||
|
@@ -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>
|
||||||
|
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
|
||||||
|
index 9968b96d..f6dccb29 100644
|
||||||
|
--- a/src/glog/logging.h.in
|
||||||
|
+++ b/src/glog/logging.h.in
|
||||||
|
@@ -649,6 +649,10 @@ void MakeCheckOpValueString(std::ostream* os, const signed char& v);
|
||||||
|
template <> GOOGLE_GLOG_DLL_DECL
|
||||||
|
void MakeCheckOpValueString(std::ostream* os, const unsigned char& v);
|
||||||
|
|
||||||
|
+// Provide printable value for nullptr_t
|
||||||
|
+template <> GOOGLE_GLOG_DLL_DECL
|
||||||
|
+void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v);
|
||||||
|
+
|
||||||
|
// 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)
|
||||||
|
diff --git a/src/logging.cc b/src/logging.cc
|
||||||
|
index 0c86cf62..256655e5 100644
|
||||||
|
--- a/src/logging.cc
|
||||||
|
+++ b/src/logging.cc
|
||||||
|
@@ -2163,6 +2163,11 @@ void MakeCheckOpValueString(std::ostream* os, const unsigned char& v) {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+template <>
|
||||||
|
+void MakeCheckOpValueString(std::ostream* os, const std::nullptr_t& v) {
|
||||||
|
+ (*os) << "nullptr";
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void InitGoogleLogging(const char* argv0) {
|
||||||
|
glog_internal_namespace_::InitGoogleLoggingUtilities(argv0);
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user