Cleanup SWIG_VERSION definition
Add Swig_obligatory_macros which must be called by each target language to define SWIG_VERSION correctly in the generated code, as well as the language specific macro SWIGXXX where XXX is the target language name. Drop the #ifdef SWIGXXX that was previously generated - I can't see the point of this and if users are defining this macro somehow, then users will need to change this Closes #1050
This commit is contained in:
parent
e123c2afe8
commit
46f7501d94
31 changed files with 68 additions and 76 deletions
|
|
@ -48,7 +48,6 @@ std_strings.swg Common macros to implemented the std::string/std::wstring typem
|
|||
strings.swg Common macros and typemaps for string and wstring (char *, wchar_t *)
|
||||
|
||||
swigmacros.swg Basic macros
|
||||
swigversion.swg Define SWIG_VERSION
|
||||
fragments.swg Macros for fragment manipulations
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -109,8 +109,6 @@ nocppval
|
|||
#endif
|
||||
%enddef
|
||||
|
||||
%include <typemaps/swigversion.swg>
|
||||
|
||||
/* -----------------------------------------------------------------------------
|
||||
* Casting operators
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
/* -----------------------------------------------------------------------------
|
||||
* Define SWIG_VERSION
|
||||
* ----------------------------------------------------------------------------- */
|
||||
|
||||
/* Define SWIG_VERSION in the interface and the wrapper code.
|
||||
*
|
||||
* Best practice is to use SWIG-time checks for SWIG_VERSION, but SWIG_VERSION
|
||||
* was unintentionally defined like this for many years, and while it was never
|
||||
* documented there are likely user interface files which rely on it.
|
||||
*/
|
||||
%define %define_swig_version_()%#define SWIG_VERSION_ SWIG_VERSION %enddef
|
||||
%insert("header") {
|
||||
%define_swig_version_()
|
||||
%#define SWIG_VERSION SWIG_VERSION_
|
||||
}
|
||||
#undef %define_swig_version_
|
||||
Loading…
Add table
Add a link
Reference in a new issue