XS-MLVP
/
swig
mirror of https://github.com/swig/swig
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ODR violations 

Detected by compiling with GCC flags `-flto -Wodr`.
This commit is contained in:
Olly Betts 2021-09-20 15:04:51 +12:00
parent 45ebd33698
commit 561a1d843d
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Modules/overload.cxx
View File

@ -21,6 +21,7 @@
String *argv_template_string; String *argv_template_string;
String *argc_template_string; String *argc_template_string;
namespace {
struct Overloaded { struct Overloaded {
Node *n; /* Node */ Node *n; /* Node */
int argc; /* Argument count */ int argc; /* Argument count */
@ -28,6 +29,7 @@ struct Overloaded {
int error; /* Ambiguity error */ int error; /* Ambiguity error */
bool implicitconv_function; /* For ordering implicitconv functions*/ bool implicitconv_function; /* For ordering implicitconv functions*/
}; };
}
static int fast_dispatch_mode = 0; static int fast_dispatch_mode = 0;
static int cast_dispatch_mode = 0; static int cast_dispatch_mode = 0;

3
Source/Modules/python.cxx
View File

@ -93,6 +93,7 @@ static int nortti = 0;
static int relativeimport = 0; static int relativeimport = 0;
/* flags for the make_autodoc function */ /* flags for the make_autodoc function */
namespace {
enum autodoc_t { enum autodoc_t {
AUTODOC_CLASS, AUTODOC_CLASS,
AUTODOC_CTOR, AUTODOC_CTOR,
@ -103,7 +104,7 @@ enum autodoc_t {
AUTODOC_CONST, AUTODOC_CONST,
AUTODOC_VAR AUTODOC_VAR
}; };
}
static const char *usage1 = "\ static const char *usage1 = "\
Python Options (available with -python)\n\ Python Options (available with -python)\n\

3
Source/Modules/r.cxx
View File

@ -1301,13 +1301,14 @@ void R::addAccessor(String *memberName, Wrapper *wrapper, String *name,
#define MAX_OVERLOAD 256 #define MAX_OVERLOAD 256
namespace {
struct Overloaded { struct Overloaded {
Node *n; /* Node */ Node *n; /* Node */
int argc; /* Argument count */ int argc; /* Argument count */
ParmList *parms; /* Parameters used for overload check */ ParmList *parms; /* Parameters used for overload check */
int error; /* Ambiguity error */ int error; /* Ambiguity error */
}; };
}
List * R::Swig_overload_rank(Node *n, List * R::Swig_overload_rank(Node *n,
bool script_lang_wrapping) { bool script_lang_wrapping) {

2
Source/Modules/ruby.cxx
View File

@ -116,6 +116,7 @@ public:
/* flags for the make_autodoc function */ /* flags for the make_autodoc function */
namespace {
enum autodoc_t { enum autodoc_t {
AUTODOC_CLASS, AUTODOC_CLASS,
AUTODOC_CTOR, AUTODOC_CTOR,
@ -127,6 +128,7 @@ enum autodoc_t {
AUTODOC_SETTER, AUTODOC_SETTER,
AUTODOC_NONE AUTODOC_NONE
}; };
}
static const char *usage = "\ static const char *usage = "\
Ruby Options (available with -ruby)\n\ Ruby Options (available with -ruby)\n\