diff options
| author | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2015-01-26 10:16:52 +0100 |
|---|---|---|
| committer | Emiel Bruijntjes <emiel.bruijntjes@copernica.com> | 2015-01-26 10:16:52 +0100 |
| commit | f0147293990f2a400912f4f8abd1b456319da0e6 (patch) | |
| tree | 2481801b779330eccdd12126897f12918fac3a67 | |
| parent | e363d36a55e74d12aeef28b2a4b1f3ba074495fd (diff) | |
fixed _NOEXCEPT macro for normal compilers, updated version number to force recompile of extensions after we introduced the constants
| -rw-r--r-- | include/noexcept.h | 21 | ||||
| -rw-r--r-- | include/version.h | 2 | ||||
| -rw-r--r-- | phpcpp.h | 1 | ||||
| -rw-r--r-- | tests/cpp/include/doubl2str.h | 1 | ||||
| -rw-r--r-- | zend/includes.h | 12 |
5 files changed, 24 insertions, 13 deletions
diff --git a/include/noexcept.h b/include/noexcept.h new file mode 100644 index 0000000..25dc1a4 --- /dev/null +++ b/include/noexcept.h @@ -0,0 +1,21 @@ +/** + * NoExcept.h + * + * Some compilers (hello microsoft!) do not yet support the "noexcept" + * keyword. To overcome this, we use a macro that expands to "noexcept" + * + * @author Emiel Bruijntjes <emiel.bruijntjes@copernica.com> + * @author atvive <https://github.com/atvise> + */ + +/** + * Macro to be able to support MSVC compiler + */ +#ifndef _NOEXCEPT +# ifndef _MSC_VER +# define _NOEXCEPT noexcept +# else +# define _NOEXCEPT __declspec(nothrow) +# endif +#endif + diff --git a/include/version.h b/include/version.h index 85d2b66..7038f20 100644 --- a/include/version.h +++ b/include/version.h @@ -12,6 +12,6 @@ /** * Macro with version number (this is incremented with every release) */ -#define PHPCPP_API_VERSION 20150120 +#define PHPCPP_API_VERSION 20150126 @@ -27,6 +27,7 @@ /** * Include all headers files that are related to this library */ +#include <phpcpp/noexcept.h> #include <phpcpp/version.h> #include <phpcpp/inivalue.h> #include <phpcpp/ini.h> diff --git a/tests/cpp/include/doubl2str.h b/tests/cpp/include/doubl2str.h index 66f2b86..5c7f208 100644 --- a/tests/cpp/include/doubl2str.h +++ b/tests/cpp/include/doubl2str.h @@ -3,7 +3,6 @@ * double -> string * */ - #include <sstream> #include <iomanip> std::string double2str(long double d) diff --git a/zend/includes.h b/zend/includes.h index 93c74ec..31d3963 100644 --- a/zend/includes.h +++ b/zend/includes.h @@ -44,19 +44,9 @@ #define BOOL2SUCCESS(b) ((b) ? SUCCESS : FAILURE) /** - * Macro to be able to support MSVC compiler - */ -#ifndef _NOEXCEPT -# ifndef _MSC_VER -# define _NOEXCEPT noexecpt -# else -# define _NOEXCEPT __declspec(nothrow) -# endif -#endif - -/** * Include other files from this library */ +#include "../include/noexcept.h" #include "../include/version.h" #include "../include/inivalue.h" #include "../include/ini.h" |