Merge branch 'master' into release-0-4-0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dca6850..808330e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@
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/ChangeLog b/ChangeLog
index d1b4248..f8e43f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2019-01-22 Google Inc. <opensource@google.com>
+
+ * google-glog: version 0.4.0.
+ * See git log for the details.
+
+2017-05-09 Google Inc. <opensource@google.com>
+
+ * google-glog: version 0.3.5
+ * See git log for the details.
+
+2015-03-09 Google Inc. <opensource@google.com>
+
+ * google-glog: version 0.3.4
+ * See git log for the details.
+
2013-02-01 Google Inc. <opensource@google.com>
* google-glog: version 0.3.3
diff --git a/cmake/INSTALL.md b/cmake/INSTALL.md
index a73f05e..1377d65 100644
--- a/cmake/INSTALL.md
+++ b/cmake/INSTALL.md
@@ -53,7 +53,7 @@
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 02a767f..02c118c 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 261cfd5..4cbed1b 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. <opensource@google.com> Tue, 22 Jan 2019 21:00:26 +0900
+
google-glog (0.3.5-1) unstable; urgency=low
* New upstream release.
diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h
index 26e080b..df80329 100755
--- a/src/windows/glog/logging.h
+++ b/src/windows/glog/logging.h
@@ -935,7 +935,8 @@
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 @@
// 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;
@@ -1175,7 +1171,6 @@
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&);
