diff options
| author | Johnny Willemsen <jwillemsen@users.noreply.github.com> | 2017-01-16 13:45:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-16 13:45:59 +0100 |
| commit | 5c2fad5470e75a781b6cec2eb4f9ae9347cb0d99 (patch) | |
| tree | 8118d9769331e2e88b9cd7ab079603b1b6429dba | |
| parent | 9c88236debbf48c0044908b8c1de294b290e3ac9 (diff) | |
| parent | 45e9ccf82425959bb798b9d1826bf668ec425705 (diff) | |
| download | ATCD-5c2fad5470e75a781b6cec2eb4f9ae9347cb0d99.tar.gz | |
Merge pull request #358 from jwillemsen/master
Only check for ACE_HAS_CPP11 for ACE_NOEXCEPT_FALSE
| -rw-r--r-- | ACE/ace/Global_Macros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 55880c6fdd5..0c42f068b47 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -115,7 +115,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // noexcept(false) specification to specify that the operation can // throw an exception -#if defined _MSC_VER && _MSC_VER >= 1900 || defined (ACE_HAS_CPP11) +#if defined (ACE_HAS_CPP11) #define ACE_NOEXCEPT_FALSE noexcept(false) #else #define ACE_NOEXCEPT_FALSE |