Fix missing stddef.h when %import of STL containers. Was causing compile failures witht g++-4.6.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12939 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
parent
e91a00ae50
commit
347f2782d2
11 changed files with 23 additions and 11 deletions
|
|
@ -5,6 +5,13 @@ See the RELEASENOTES file for a summary of changes in each release.
|
||||||
Version 2.0.5 (in progress)
|
Version 2.0.5 (in progress)
|
||||||
===========================
|
===========================
|
||||||
|
|
||||||
|
2012-03-20: wsfulton
|
||||||
|
Fix #3487706 and #3391906 - missing stddef.h include for ptrdiff_t when using %import
|
||||||
|
for STL containers and compiling with g++-4.6. An include of stddef.h is now only
|
||||||
|
generated when SWIG generates STL helper templates which require ptrdiff_t. If you
|
||||||
|
were previously relying on "#include <stddef.h>" always being generated when using a
|
||||||
|
%include of an STL header, you may now need to add this in manually.
|
||||||
|
|
||||||
2012-03-16: wsfulton
|
2012-03-16: wsfulton
|
||||||
Apply patch #3392264 from Sebastien Bine to parse (unsigned) long long types in enum value assignment.
|
Apply patch #3392264 from Sebastien Bine to parse (unsigned) long long types in enum value assignment.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ namespace swig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
%fragment("OctSequence_Base","header")
|
%fragment("OctSequence_Base","header",fragment="<stddef.h>")
|
||||||
{
|
{
|
||||||
%#include <functional>
|
%#include <functional>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
|
|
||||||
%include <std_common.i>
|
%include <std_common.i>
|
||||||
|
|
||||||
%fragment("OctSwigIterator","header") {
|
%fragment("OctSwigIterator","header",fragment="<stddef.h>") {
|
||||||
namespace swig {
|
namespace swig {
|
||||||
struct stop_iteration {
|
struct stop_iteration {
|
||||||
};
|
};
|
||||||
|
|
@ -113,7 +113,7 @@ namespace swig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
%fragment("OctSwigIterator_T","header",fragment="OctSwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
%fragment("OctSwigIterator_T","header",fragment="<stddef.h>",fragment="OctSwigIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
||||||
namespace swig {
|
namespace swig {
|
||||||
template<typename OutIterator>
|
template<typename OutIterator>
|
||||||
class OctSwigIterator_T : public OctSwigIterator
|
class OctSwigIterator_T : public OctSwigIterator
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ namespace swig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
%fragment("SwigPySequence_Base","header")
|
%fragment("SwigPySequence_Base","header",fragment="<stddef.h>")
|
||||||
{
|
{
|
||||||
%#include <functional>
|
%#include <functional>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
%include <std_common.i>
|
%include <std_common.i>
|
||||||
|
|
||||||
%fragment("SwigPyIterator","header") {
|
%fragment("SwigPyIterator","header",fragment="<stddef.h>") {
|
||||||
namespace swig {
|
namespace swig {
|
||||||
struct stop_iteration {
|
struct stop_iteration {
|
||||||
};
|
};
|
||||||
|
|
@ -139,7 +139,7 @@ namespace swig {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
%fragment("SwigPyIterator_T","header",fragment="SwigPyIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
%fragment("SwigPyIterator_T","header",fragment="<stddef.h>",fragment="SwigPyIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
||||||
namespace swig {
|
namespace swig {
|
||||||
template<typename OutIterator>
|
template<typename OutIterator>
|
||||||
class SwigPyIterator_T : public SwigPyIterator
|
class SwigPyIterator_T : public SwigPyIterator
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
%fragment("RSequence_Base","header")
|
%fragment("RSequence_Base","header",fragment="<stddef.h>")
|
||||||
{
|
{
|
||||||
%#include <functional>
|
%#include <functional>
|
||||||
namespace swig {
|
namespace swig {
|
||||||
|
|
|
||||||
|
|
@ -153,6 +153,7 @@ namespace swig {
|
||||||
}
|
}
|
||||||
|
|
||||||
%fragment("RubySequence_Cont","header",
|
%fragment("RubySequence_Cont","header",
|
||||||
|
fragment="<stddef.h>",
|
||||||
fragment="StdTraits",
|
fragment="StdTraits",
|
||||||
fragment="RubySequence_Base",
|
fragment="RubySequence_Base",
|
||||||
fragment="ConstIterator_T")
|
fragment="ConstIterator_T")
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
%include <std_common.i>
|
%include <std_common.i>
|
||||||
|
|
||||||
|
|
||||||
%fragment("ConstIterator","header",fragment="GC_VALUE_definition") {
|
%fragment("ConstIterator","header",fragment="<stddef.h>",fragment="GC_VALUE_definition") {
|
||||||
namespace swig {
|
namespace swig {
|
||||||
struct stop_iteration {
|
struct stop_iteration {
|
||||||
};
|
};
|
||||||
|
|
@ -270,7 +270,7 @@ namespace swig {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
%fragment("ConstIterator_T","header",fragment="ConstIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
%fragment("ConstIterator_T","header",fragment="<stddef.h>",fragment="ConstIterator",fragment="StdTraits",fragment="StdIteratorTraits") {
|
||||||
namespace swig {
|
namespace swig {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
Sets
|
Sets
|
||||||
*/
|
*/
|
||||||
|
|
||||||
%fragment("StdSetTraits","header",fragment="StdSequenceTraits")
|
%fragment("StdSetTraits","header",fragment="<stddef.h>",fragment="StdSequenceTraits")
|
||||||
%{
|
%{
|
||||||
namespace swig {
|
namespace swig {
|
||||||
template <class RubySeq, class T>
|
template <class RubySeq, class T>
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
|
||||||
%fragment("StdIteratorTraits","header") %{
|
%fragment("StdIteratorTraits","header",fragment="<stddef.h>") %{
|
||||||
#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
|
#if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
|
||||||
# if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
|
# if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
|
||||||
# define SWIG_STD_NOITERATOR_TRAITS_STL
|
# define SWIG_STD_NOITERATOR_TRAITS_STL
|
||||||
|
|
|
||||||
|
|
@ -149,6 +149,10 @@
|
||||||
#endif
|
#endif
|
||||||
%}
|
%}
|
||||||
|
|
||||||
|
%fragment("<stddef.h>", "header") %{
|
||||||
|
#include <stddef.h>
|
||||||
|
%}
|
||||||
|
|
||||||
/* -----------------------------------------------------------------------------
|
/* -----------------------------------------------------------------------------
|
||||||
* special macros for fragments
|
* special macros for fragments
|
||||||
* ----------------------------------------------------------------------------- */
|
* ----------------------------------------------------------------------------- */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue