luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #224 from jray272/run-windows-script

Browse Source 
Run src/windows/preprocess.sh to pick up latest logging.h.in changes
This commit is contained in:
Shinichiro Hamaji 2017-08-09 15:04:26 +09:00 committed by GitHub
commit e209906823
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -31,6 +31,7 @@ Fumitoshi Ukai <ukai@google.com>
Guillaume Dumont <dumont.guillaume@gmail.com> Guillaume Dumont <dumont.guillaume@gmail.com>
Håkan L. S. Younes <hyounes@google.com> Håkan L. S. Younes <hyounes@google.com>
Ivan Penkov <ivanpe@google.com> Ivan Penkov <ivanpe@google.com>
Jim Ray <jimray@google.com>
Michael Tanner <michael@tannertaxpro.com> Michael Tanner <michael@tannertaxpro.com>
MiniLight <MiniLightAR@Gmail.com> MiniLight <MiniLightAR@Gmail.com>
Peter Collingbourne <pcc@google.com> Peter Collingbourne <pcc@google.com>

7
src/windows/glog/logging.h
View File

@ -1117,6 +1117,12 @@ class GOOGLE_GLOG_DLL_DECL LogStreamBuf : public std::streambuf {
LogStreamBuf(char *buf, int len) { LogStreamBuf(char *buf, int len) {
setp(buf, buf + len - 2); 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. // This effectively ignores overflow.
virtual int_type overflow(int_type ch) { virtual int_type overflow(int_type ch) {
return ch; return ch;
@ -1179,6 +1185,7 @@ public:
size_t pcount() const { return streambuf_.pcount(); } size_t pcount() const { return streambuf_.pcount(); }
char* pbase() const { return streambuf_.pbase(); } char* pbase() const { return streambuf_.pbase(); }
char* str() const { return pbase(); } char* str() const { return pbase(); }
void reset() { streambuf_.reset(); }
private: private:
LogStream(const LogStream&); LogStream(const LogStream&);