Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
G
glog
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
glog
Commits
da816ea7
Commit
da816ea7
authored
Mar 07, 2017
by
Fumitoshi Ukai
Committed by
GitHub
Mar 07, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #169 from mayah/windows-no-return
Add __declspec(noreturn) on Win
parents
ab654547
8fa778aa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
logging.h
src/windows/glog/logging.h
+3
-3
preprocess.sh
src/windows/preprocess.sh
+1
-1
No files found.
src/windows/glog/logging.h
View file @
da816ea7
...
...
@@ -1250,7 +1250,7 @@ public:
void
SendToSyslogAndLog
();
// Actually dispatch to syslog and the logs
// Call abort() or similar to perform LOG(FATAL) crash.
static
void
Fail
();
static
void
__declspec
(
noreturn
)
Fail
();
std
::
ostream
&
stream
();
...
...
@@ -1298,7 +1298,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
();
__declspec
(
noreturn
)
~
LogMessageFatal
();
};
// A non-macro interface to the log facility; (useful
...
...
@@ -1602,7 +1602,7 @@ class GOOGLE_GLOG_DLL_DECL NullStreamFatal : public NullStream {
NullStreamFatal
()
{
}
NullStreamFatal
(
const
char
*
file
,
int
line
,
const
CheckOpString
&
result
)
:
NullStream
(
file
,
line
,
result
)
{
}
~
NullStreamFatal
()
throw
()
{
_exit
(
1
);
}
__declspec
(
noreturn
)
~
NullStreamFatal
()
throw
()
{
_exit
(
1
);
}
};
// Install a signal handler that will dump signal information and a stack
...
...
src/windows/preprocess.sh
View file @
da816ea7
...
...
@@ -95,7 +95,7 @@ DLLDEF_DEFINES="\
-e
"s!@ac_cv_have_libgflags@!0!g"
\
-e
"s!@ac_cv_have___builtin_expect@!0!g"
\
-e
"s!@ac_cv_cxx_using_operator@!1!g"
\
-e
"s!@ac_cv___attribute___noreturn@!!g"
\
-e
"s!@ac_cv___attribute___noreturn@!
__declspec(noreturn)
!g"
\
-e
"s!@ac_cv___attribute___noinline@!!g"
\
-e
"s!@ac_cv___attribute___printf_4_5@!!g"
\
-e
"s!@ac_google_attribute@!
${
HAVE___ATTRIBUTE__
:-
0
}
!g"
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment