From 4526765f8ff382db8ffd61be992fcbcb219dda97 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 5 Feb 2020 15:20:26 +0100 Subject: [PATCH] Remove extra semicolons to avoid gcc -Wpedantic warnings Another fix after 00cdab77c50b454e42d5e1f956d55d1bfebfa271 --- include/wx/wxcrt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index 4fe0ba9650..d15458cd85 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -870,17 +870,17 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr) #ifdef wxHAS_NULLPTR_T inline double wxStrtod(const wxString& nptr, std::nullptr_t) - { return wxStrtod(nptr.wx_str(), static_cast(NULL)); }; + { return wxStrtod(nptr.wx_str(), static_cast(NULL)); } inline double wxStrtod(const wxCStrData& nptr, std::nullptr_t) - { return wxStrtod(nptr.AsString(), static_cast(NULL)); }; + { return wxStrtod(nptr.AsString(), static_cast(NULL)); } #define WX_STRTOX_DEFINE_NULLPTR_OVERLOADS(rettype, name) \ inline rettype name(const wxString& nptr, std::nullptr_t, int base) \ { return name(nptr.wx_str(), static_cast(NULL), \ - base); }; \ + base); } \ inline rettype name(const wxCStrData& nptr, std::nullptr_t, int base) \ { return name(nptr.AsString(), static_cast(NULL), \ - base); }; + base); } #else // !wxHAS_NULLPTR_T #define WX_STRTOX_DEFINE_NULLPTR_OVERLOADS(rettype, name)