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

Run src/windows/preprocess.sh

Browse Source
This commit is contained in:
Shinichiro Hamaji 2019-01-22 20:58:13 +09:00
parent 5d46e1bcfc
commit 6d6d31872e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -935,7 +935,8 @@ struct CompileAssert {
struct CrashReason; struct CrashReason;
// Returns true if FailureSignalHandler is installed. // 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_ } // namespace glog_internal_namespace_
#define LOG_EVERY_N(severity, n) \ #define LOG_EVERY_N(severity, n) \
@ -1107,16 +1108,11 @@ namespace base_logging {
// buffer to allow for a '\n' and '\0'. // buffer to allow for a '\n' and '\0'.
class GOOGLE_GLOG_DLL_DECL LogStreamBuf : public std::streambuf { class GOOGLE_GLOG_DLL_DECL LogStreamBuf : public std::streambuf {
public: 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) { 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;
@ -1155,9 +1151,14 @@ public:
// 2005 if you are deriving from a type in the Standard C++ Library" // 2005 if you are deriving from a type in the Standard C++ Library"
// http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx // http://msdn.microsoft.com/en-us/library/3tdb471s(VS.80).aspx
// Let's just ignore the warning. // 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 { class GOOGLE_GLOG_DLL_DECL LogStream : public std::ostream {
GLOG_MSVC_POP_WARNING() #ifdef _MSC_VER
# pragma warning(pop)
#endif
public: public:
LogStream(char *buf, int len, int ctr) LogStream(char *buf, int len, int ctr)
: std::ostream(NULL), : std::ostream(NULL),
@ -1175,7 +1176,6 @@ GLOG_MSVC_POP_WARNING()
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&);