coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2026-02-06 09:49:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Warning / build fixes for gcc7

Browse Source
This commit is contained in:
Jason Turner 2017-08-24 18:35:03 -06:00
parent 9bbe723827
commit 9596e15049
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@ -111,7 +111,7 @@ namespace chaiscript
/// Internal function for converting from a string to a value /// Internal function for converting from a string to a value
/// uses ostream operator >> to perform the conversion /// uses ostream operator >> to perform the conversion
template<typename Input> template<typename Input>
auto parse_string(const std::string &i) Input parse_string(const std::string &i)
{ {
if constexpr (!std::is_same<Input, wchar_t>::value if constexpr (!std::is_same<Input, wchar_t>::value
&& !std::is_same<Input, char16_t>::value && !std::is_same<Input, char16_t>::value

3
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@ -59,6 +59,7 @@ namespace chaiscript
#pragma GCC diagnostic ignored "-Wconversion" #pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wsign-conversion" #pragma GCC diagnostic ignored "-Wsign-conversion"
#pragma GCC diagnostic ignored "-Wfloat-conversion" #pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wswitch"
#endif #endif
/// \brief Represents any numeric type, generically. Used internally for generic operations between POD values /// \brief Represents any numeric type, generically. Used internally for generic operations between POD values
@ -80,7 +81,7 @@ namespace chaiscript
}; };
template<typename T> template<typename T>
constexpr static inline void check_divide_by_zero(T t) constexpr static inline void check_divide_by_zero([[maybe_unused]] T t)
{ {
#ifndef CHAISCRIPT_NO_PROTECT_DIVIDEBYZERO #ifndef CHAISCRIPT_NO_PROTECT_DIVIDEBYZERO
if constexpr (!std::is_floating_point<T>::value) { if constexpr (!std::is_floating_point<T>::value) {