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

Merge pull request #96 from mayah/update-windows

Browse Source 
Update src/windows/glog/logging.h to ToT
This commit is contained in:
Fumitoshi Ukai 2016-03-31 17:50:09 +09:00
commit f176cc8454
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,14 +52,6 @@
#endif #endif
#include <vector> #include <vector>
// Annoying stuff for windows -- makes sure clients can import these functions
#ifndef GOOGLE_GLOG_DLL_DECL
# if defined(_WIN32) && !defined(__CYGWIN__)
# define GOOGLE_GLOG_DLL_DECL __declspec(dllimport)
# else
# define GOOGLE_GLOG_DLL_DECL
# endif
#endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define GLOG_MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \ #define GLOG_MSVC_PUSH_DISABLE_WARNING(n) __pragma(warning(push)) \
__pragma(warning(disable:n)) __pragma(warning(disable:n))
@ -69,6 +61,15 @@
#define GLOG_MSVC_POP_WARNING() #define GLOG_MSVC_POP_WARNING()
#endif #endif
// Annoying stuff for windows -- makes sure clients can import these functions
#ifndef GOOGLE_GLOG_DLL_DECL
# if defined(_WIN32) && !defined(__CYGWIN__)
# define GOOGLE_GLOG_DLL_DECL __declspec(dllimport)
# else
# define GOOGLE_GLOG_DLL_DECL
# endif
#endif
// We care a lot about number of bits things take up. Unfortunately, // We care a lot about number of bits things take up. Unfortunately,
// systems define their bit-specific ints in a lot of different ways. // systems define their bit-specific ints in a lot of different ways.
// We use our own way, and have a typedef to get there. // We use our own way, and have a typedef to get there.
@ -133,15 +134,28 @@ typedef unsigned __int64 uint64;
#ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN #ifndef GOOGLE_PREDICT_BRANCH_NOT_TAKEN
#if 0 #if 0
#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0)) #define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) (__builtin_expect(x, 0))
#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0))
#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
#else #else
#define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x #define GOOGLE_PREDICT_BRANCH_NOT_TAKEN(x) x
#endif
#endif
#ifndef GOOGLE_PREDICT_FALSE
#if 0
#define GOOGLE_PREDICT_FALSE(x) (__builtin_expect(x, 0))
#else
#define GOOGLE_PREDICT_FALSE(x) x #define GOOGLE_PREDICT_FALSE(x) x
#endif
#endif
#ifndef GOOGLE_PREDICT_TRUE
#if 0
#define GOOGLE_PREDICT_TRUE(x) (__builtin_expect(!!(x), 1))
#else
#define GOOGLE_PREDICT_TRUE(x) x #define GOOGLE_PREDICT_TRUE(x) x
#endif #endif
#endif #endif
// Make a bunch of macros for logging. The way to log things is to stream // Make a bunch of macros for logging. The way to log things is to stream
// things to LOG(<a particular severity level>). E.g., // things to LOG(<a particular severity level>). E.g.,
// //
@ -351,6 +365,9 @@ DECLARE_int32(minloglevel);
// default logging directory. // default logging directory.
DECLARE_string(log_dir); DECLARE_string(log_dir);
// Set the log file mode.
DECLARE_int32(logfile_mode);
// Sets the path of the directory into which to put additional links // Sets the path of the directory into which to put additional links
// to the log files. // to the log files.
DECLARE_string(log_link); DECLARE_string(log_link);
@ -546,7 +563,7 @@ class LogSink; // defined below
// vector<string> *outvec; // vector<string> *outvec;
// The cast is to disambiguate NULL arguments. // The cast is to disambiguate NULL arguments.
#define LOG_STRING(severity, outvec) \ #define LOG_STRING(severity, outvec) \
LOG_TO_STRING_##severity(static_cast<vector<string>*>(outvec)).stream() LOG_TO_STRING_##severity(static_cast<std::vector<std::string>*>(outvec)).stream()
#define LOG_IF(severity, condition) \ #define LOG_IF(severity, condition) \
!(condition) ? (void) 0 : google::LogMessageVoidify() & LOG(severity) !(condition) ? (void) 0 : google::LogMessageVoidify() & LOG(severity)
@ -1158,6 +1175,8 @@ public:
char* str() const { return pbase(); } char* str() const { return pbase(); }
private: private:
LogStream(const LogStream&);
LogStream& operator=(const LogStream&);
base_logging::LogStreamBuf streambuf_; base_logging::LogStreamBuf streambuf_;
int ctr_; // Counter hack (for the LOG_EVERY_X() macro) int ctr_; // Counter hack (for the LOG_EVERY_X() macro)
LogStream *self_; // Consistency check hack LogStream *self_; // Consistency check hack
@ -1577,7 +1596,7 @@ class GOOGLE_GLOG_DLL_DECL NullStreamFatal : public NullStream {
NullStreamFatal() { } NullStreamFatal() { }
NullStreamFatal(const char* file, int line, const CheckOpString& result) : NullStreamFatal(const char* file, int line, const CheckOpString& result) :
NullStream(file, line, result) { } NullStream(file, line, result) { }
~NullStreamFatal() { _exit(1); } ~NullStreamFatal() throw () { _exit(1); }
}; };
// Install a signal handler that will dump signal information and a stack // Install a signal handler that will dump signal information and a stack