diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-29 10:24:41 +0200 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2014-08-29 10:24:41 +0200 |
| commit | 856aaf9880848cab154189a36e33d4d10e3da185 (patch) | |
| tree | 944174ef4046a5af0f27d4d7142aa72b82f8c2f5 /include | |
| parent | cb6808285bb0e41f90245e568951ee24b6a5faf2 (diff) | |
| parent | 780fde0f4c07920c210cc45ef0c5e4b05f81c76f (diff) | |
Merge pull request #128 from andot/vs2013
Fixed compatibility issue with VS2013
Diffstat (limited to 'include')
| -rw-r--r-- | include/base.h | 8 | ||||
| -rw-r--r-- | include/exception.h | 4 | ||||
| -rw-r--r-- | include/ini.h | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/include/base.h b/include/base.h index 87c7483..f5ebed1 100644 --- a/include/base.h +++ b/include/base.h @@ -87,7 +87,7 @@ public: */ Value operator[](const char *name) const { - return Value(this)[name]; + return Value(this).get(name); } /** @@ -97,7 +97,7 @@ public: */ Value operator[](const std::string &name) const { - return Value(this)[name]; + return Value(this).get(name); } /** @@ -107,7 +107,7 @@ public: */ Value property(const char *name) const { - return Value(this)[name]; + return Value(this).get(name); } /** @@ -117,7 +117,7 @@ public: */ Value property(const std::string &name) const { - return Value(this)[name]; + return Value(this).get(name); } /** diff --git a/include/exception.h b/include/exception.h index aff0afc..94aaa85 100644 --- a/include/exception.h +++ b/include/exception.h @@ -52,7 +52,11 @@ public: * Overridden what method * @return const char * */ +#ifdef _NOEXCEPT + virtual const char *what() const _NOEXCEPT override +#else virtual const char *what() const noexcept override +#endif { return _message.c_str(); } diff --git a/include/ini.h b/include/ini.h index 1d881e9..69137a2 100644 --- a/include/ini.h +++ b/include/ini.h @@ -125,7 +125,11 @@ private: * @param value * @return string */ +#ifdef _MSC_VER + static const char* bool2str(const bool value) +#else static constexpr const char* bool2str(const bool value) +#endif { // cast to a string return ( static_cast<bool>(value) ? "On" : "Off"); |