summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergiu Dotenco <sergiu.dotenco@th-nuernberg.de>2015-03-26 14:55:37 (GMT)
committerSergiu Dotenco <sergiu.dotenco@gmail.com>2015-07-15 20:34:57 (GMT)
commit332525803605d752ff054535cb0600d680f4ac9a (patch)
tree1d7a3b1b4cf64b9ad93054288f798df50fb9f579 /src
parent3d9fea9e846cd6f67621fd0725d7c682a9350ba8 (diff)
downloadglog-332525803605d752ff054535cb0600d680f4ac9a.zip
glog-332525803605d752ff054535cb0600d680f4ac9a.tar.gz
glog-332525803605d752ff054535cb0600d680f4ac9a.tar.bz2
allow to use __declspec(noreturn)
Diffstat (limited to 'src')
-rw-r--r--src/glog/logging.h.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index 61ab214..6ef6ad4 100644
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -1219,7 +1219,7 @@ public:
void SendToSyslogAndLog(); // Actually dispatch to syslog and the logs
// Call abort() or similar to perform LOG(FATAL) crash.
- static void Fail() @ac_cv___attribute___noreturn@;
+ static void @ac_cv___attribute___noreturn@ Fail();
std::ostream& stream();
@@ -1267,7 +1267,7 @@ class GOOGLE_GLOG_DLL_DECL LogMessageFatal : public LogMessage {
public:
LogMessageFatal(const char* file, int line);
LogMessageFatal(const char* file, int line, const CheckOpString& result);
- ~LogMessageFatal() @ac_cv___attribute___noreturn@;
+ @ac_cv___attribute___noreturn@ ~LogMessageFatal();
};
// A non-macro interface to the log facility; (useful
@@ -1571,7 +1571,7 @@ class GOOGLE_GLOG_DLL_DECL NullStreamFatal : public NullStream {
NullStreamFatal() { }
NullStreamFatal(const char* file, int line, const CheckOpString& result) :
NullStream(file, line, result) { }
- @ac_cv___attribute___noreturn@ ~NullStreamFatal() { _exit(1); }
+ @ac_cv___attribute___noreturn@ ~NullStreamFatal() throw () { _exit(1); }
};
// Install a signal handler that will dump signal information and a stack