Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
benchmark
Project
Overview
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
benchmark
Commits
3685cad6
Commit
3685cad6
authored
May 31, 2016
by
Billy O'Neal
Committed by
Dominic Hamon
May 31, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added new noexcept macros for VS2013 (#229)
parent
74a278e2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
macros.h
include/benchmark/macros.h
+8
-0
check.h
src/check.h
+1
-1
No files found.
include/benchmark/macros.h
View file @
3685cad6
...
@@ -28,15 +28,23 @@
...
@@ -28,15 +28,23 @@
# define BENCHMARK_UNUSED __attribute__((unused))
# define BENCHMARK_UNUSED __attribute__((unused))
# define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline))
# define BENCHMARK_ALWAYS_INLINE __attribute__((always_inline))
# define BENCHMARK_NOEXCEPT noexcept
# define BENCHMARK_NOEXCEPT noexcept
# define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
#elif defined(_MSC_VER) && !defined(__clang__)
#elif defined(_MSC_VER) && !defined(__clang__)
# define BENCHMARK_UNUSED
# define BENCHMARK_UNUSED
# define BENCHMARK_ALWAYS_INLINE __forceinline
# define BENCHMARK_ALWAYS_INLINE __forceinline
# if _MSC_VER >= 1900
# define BENCHMARK_NOEXCEPT noexcept
# define BENCHMARK_NOEXCEPT_OP(x) noexcept(x)
# else
# define BENCHMARK_NOEXCEPT
# define BENCHMARK_NOEXCEPT
# define BENCHMARK_NOEXCEPT_OP(x)
# endif
# define __func__ __FUNCTION__
# define __func__ __FUNCTION__
#else
#else
# define BENCHMARK_UNUSED
# define BENCHMARK_UNUSED
# define BENCHMARK_ALWAYS_INLINE
# define BENCHMARK_ALWAYS_INLINE
# define BENCHMARK_NOEXCEPT
# define BENCHMARK_NOEXCEPT
# define BENCHMARK_NOEXCEPT_OP(x)
#endif
#endif
#if defined(__GNUC__)
#if defined(__GNUC__)
...
...
src/check.h
View file @
3685cad6
...
@@ -37,7 +37,7 @@ public:
...
@@ -37,7 +37,7 @@ public:
return
log_
;
return
log_
;
}
}
BENCHMARK_NORETURN
~
CheckHandler
()
noexcept
(
false
)
{
BENCHMARK_NORETURN
~
CheckHandler
()
BENCHMARK_NOEXCEPT_OP
(
false
)
{
log_
<<
std
::
endl
;
log_
<<
std
::
endl
;
CallAbortHandler
();
CallAbortHandler
();
}
}
...
...
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