From 6d6d31872e2419d0678a6447d436cb592f0ea50e Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Tue, 22 Jan 2019 20:58:13 +0900 Subject: [PATCH 1/4] Run src/windows/preprocess.sh --- src/windows/glog/logging.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h index 26e080b85..d79915611 100755 --- a/src/windows/glog/logging.h +++ b/src/windows/glog/logging.h @@ -935,7 +935,8 @@ struct CompileAssert { struct CrashReason; // Returns true if FailureSignalHandler is installed. -bool IsFailureSignalHandlerInstalled(); +// Needs to be exported since it's used by the signalhandler_unittest. +GOOGLE_GLOG_DLL_DECL bool IsFailureSignalHandlerInstalled(); } // namespace glog_internal_namespace_ #define LOG_EVERY_N(severity, n) \ @@ -1107,16 +1108,11 @@ namespace base_logging { // buffer to allow for a '\n' and '\0'. class GOOGLE_GLOG_DLL_DECL LogStreamBuf : public std::streambuf { public: - // REQUIREMENTS: "len" must be >= 2 to account for the '\n' and '\n'. + // REQUIREMENTS: "len" must be >= 2 to account for the '\n' and '\0'. LogStreamBuf(char *buf, int len) { setp(buf, buf + len - 2); } - // Resets the buffer. Useful if we reuse it by means of TLS. - void reset() { - setp(pbase(), epptr()); - } - // This effectively ignores overflow. virtual int_type overflow(int_type ch) { return ch; @@ -1155,9 +1151,14 @@ class GOOGLE_GLOG_DLL_DECL LogMessage { // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -GLOG_MSVC_PUSH_DISABLE_WARNING(4275) +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4275) +#endif class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream { -GLOG_MSVC_POP_WARNING() +#ifdef _MSC_VER +# pragma warning(pop) +#endif public: LogStream(char *buf, int len, int ctr) : std::ostream(NULL), @@ -1175,7 +1176,6 @@ GLOG_MSVC_POP_WARNING() size_t pcount() const { return streambuf_.pcount(); } char* pbase() const { return streambuf_.pbase(); } char* str() const { return pbase(); } - void reset() { streambuf_.reset(); } private: LogStream(const LogStream&); From 406b0e702f76c8cb56eb26361a723db9d25642f8 Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Tue, 22 Jan 2019 21:00:50 +0900 Subject: [PATCH 2/4] glog: release 0.4.0 --- CMakeLists.txt | 2 +- cmake/INSTALL.md | 2 +- configure.ac | 2 +- packages/deb/changelog | 6 ++++++ 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dca6850a4..808330e20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ if (POLICY CMP0063) cmake_policy (SET CMP0063 NEW) endif (POLICY CMP0063) -project(glog VERSION 0.3.5 LANGUAGES C CXX) +project(glog VERSION 0.4.0 LANGUAGES C CXX) set (CPACK_PACKAGE_NAME glog) set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "") diff --git a/cmake/INSTALL.md b/cmake/INSTALL.md index a73f05e3a..1377d652e 100644 --- a/cmake/INSTALL.md +++ b/cmake/INSTALL.md @@ -53,7 +53,7 @@ If you have Glog installed in your system, you can use the CMake command cmake_minimum_required(VERSION 3.0.2) project(myproj VERSION 1.0) -find_package(glog 0.3.5 REQUIRED) +find_package(glog 0.4.0 REQUIRED) add_executable(myapp main.cpp) target_link_libraries(myapp glog::glog) diff --git a/configure.ac b/configure.ac index 02a767f2f..02c118c02 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ # make sure we're interpreted by some minimal autoconf AC_PREREQ(2.57) -AC_INIT(glog, 0.3.5, opensource@google.com) +AC_INIT(glog, 0.4.0, opensource@google.com) # The argument here is just something that should be in the current directory # (for sanity checking) AC_CONFIG_SRCDIR(README.md) diff --git a/packages/deb/changelog b/packages/deb/changelog index 261cfd5fe..4cbed1bd0 100644 --- a/packages/deb/changelog +++ b/packages/deb/changelog @@ -1,3 +1,9 @@ +google-glog (0.4.0-1) unstable; urgency=low + + * New upstream release. + + -- Google Inc. Tue, 22 Jan 2019 21:00:26 +0900 + google-glog (0.3.5-1) unstable; urgency=low * New upstream release. From 1d98d00c7eeb7b8beaec654a15a7c50fcd6cd2a8 Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Wed, 23 Jan 2019 12:24:15 +0900 Subject: [PATCH 3/4] Update ChangeLog to record release dates at least --- ChangeLog | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ChangeLog b/ChangeLog index d1b424844..f8e43f8b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2019-01-22 Google Inc. + + * google-glog: version 0.4.0. + * See git log for the details. + +2017-05-09 Google Inc. + + * google-glog: version 0.3.5 + * See git log for the details. + +2015-03-09 Google Inc. + + * google-glog: version 0.3.4 + * See git log for the details. + 2013-02-01 Google Inc. * google-glog: version 0.3.3 From ed1ef7c4db8d51beb2cea5579aa62f7a3c9d928e Mon Sep 17 00:00:00 2001 From: Shinichiro Hamaji Date: Thu, 24 Jan 2019 09:25:43 +0900 Subject: [PATCH 4/4] Apply #397 to glog/logging.h.in windows/glog/logging.h is expected to be generated by src/windows/preprocess.sh and should not be modified directly. --- src/glog/logging.h.in | 9 ++------- src/windows/glog/logging.h | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in index 448253f61..2f0722d04 100644 --- a/src/glog/logging.h.in +++ b/src/glog/logging.h.in @@ -1147,14 +1147,9 @@ public: // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4275) -#endif +GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream { -#ifdef _MSC_VER -# pragma warning(pop) -#endif +GLOG_MSVC_POP_WARNING() public: LogStream(char *buf, int len, int ctr) : std::ostream(NULL), diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h index d79915611..df8032960 100755 --- a/src/windows/glog/logging.h +++ b/src/windows/glog/logging.h @@ -1151,14 +1151,9 @@ class GOOGLE_GLOG_DLL_DECL LogMessage { // 2005 if you are deriving from a type in the Standard C++ Library" // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // Let's just ignore the warning. -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable: 4275) -#endif +GLOG_MSVC_PUSH_DISABLE_WARNING(4275) class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream { -#ifdef _MSC_VER -# pragma warning(pop) -#endif +GLOG_MSVC_POP_WARNING() public: LogStream(char *buf, int len, int ctr) : std::ostream(NULL),