Update glog to 0.6

PiperOrigin-RevId: 551269455
2023-07-26 11:41:24 -07:00
parent 750f498b14
commit 87b925795d
3 changed files with 66 additions and 10 deletions
@@ -1,8 +1,19 @@
 diff --git a/src/logging.cc b/src/logging.cc
-index 4028ccc..483e639 100644
+index 0b5e6ee..be5a506 100644
 --- a/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_;
 }

@@ -26,7 +37,7 @@ index 4028ccc..483e639 100644
 // Flush buffered message, called by the destructor, or any other function
 // that needs to synchronize the log.
 void LogMessage::Flush() {
-@@ -1779,6 +1796,12 @@ void LogMessage::Flush() {
+@@ -1313,6 +1334,12 @@ void LogMessage::Flush() {
   }
   LogDestination::WaitForSinks(data_);

@@ -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 <[email protected]>
+ Abhishek Parmar <[email protected]>
+ Andrew Schwartzmeyer <[email protected]>
+ Andy Ying <[email protected]>
+Bret McKee <[email protected]>
+ Brian Silverman <[email protected]>
+ Fumitoshi Ukai <[email protected]>
+ Guillaume Dumont <[email protected]>
+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);
+ }