External/cxxopts
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GCC version check for null deref

Browse Source 
Fixes #288.
This commit is contained in:
Jarryd Beck 2021-06-01 17:38:41 +10:00
parent 97a4d5511f
commit a20bda6179
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/cxxopts.hpp
View File

@ -70,6 +70,10 @@ THE SOFTWARE.
#define CXXOPTS__VERSION_MINOR 0 #define CXXOPTS__VERSION_MINOR 0
#define CXXOPTS__VERSION_PATCH 0 #define CXXOPTS__VERSION_PATCH 0
#if (__GNUC__ < 10 || (__GNUC__ == 10 && __GNUC_MINOR__ < 1)) && __GNUC__ >= 6
#define CXXOPTS_NULL_DEREF_IGNORE
#endif
namespace cxxopts namespace cxxopts
{ {
static constexpr struct { static constexpr struct {
@ -1386,11 +1390,9 @@ namespace cxxopts
m_long_name = &details->long_name(); m_long_name = &details->long_name();
} }
#if defined(__GNUC__) #if defined(CXXOPTS_NULL_DEREF_IGNORE)
#if __GNUC__ <= 10 && __GNUC_MINOR__ <= 1
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Werror=null-dereference" #pragma GCC diagnostic ignored "-Wnull-dereference"
#endif
#endif #endif
CXXOPTS_NODISCARD CXXOPTS_NODISCARD
@ -1400,10 +1402,8 @@ namespace cxxopts
return m_count; return m_count;
} }
#if defined(__GNUC__) #if defined(CXXOPTS_NULL_DEREF_IGNORE)
#if __GNUC__ <= 10 && __GNUC_MINOR__ <= 1
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif
#endif #endif
// TODO: maybe default options should count towards the number of arguments // TODO: maybe default options should count towards the number of arguments