jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Error out attempting to use directors without -c++

Browse source 
Remove redundant #ifdef __cplusplus markers in director.swg
This commit is contained in:
William S Fulton 2013-12-23 20:23:54 +00:00
commit 1a19451c1b
10 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/csharp/director.swg
View file

@ -5,8 +5,6 @@
* methods can be called from C++. * methods can be called from C++.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#ifdef __cplusplus
#if defined(DEBUG_DIRECTOR_OWNED) #if defined(DEBUG_DIRECTOR_OWNED)
#include <iostream> #include <iostream>
#endif #endif
@ -45,6 +43,3 @@ namespace Swig {
}; };
} }
#endif /* __cplusplus */

3
Lib/d/director.swg
View file

@ -5,8 +5,6 @@
* methods can be called from C++. * methods can be called from C++.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#ifdef __cplusplus
#if defined(DEBUG_DIRECTOR_OWNED) #if defined(DEBUG_DIRECTOR_OWNED)
#include <iostream> #include <iostream>
#endif #endif
@ -47,4 +45,3 @@ namespace Swig {
}; };
} }
#endif /* __cplusplus */

3
Lib/java/director.swg
View file

@ -5,8 +5,6 @@
* method calls from C++ to Java extensions. * method calls from C++ to Java extensions.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#ifdef __cplusplus
#if defined(DEBUG_DIRECTOR_OWNED) || defined(DEBUG_DIRECTOR_EXCEPTION) #if defined(DEBUG_DIRECTOR_OWNED) || defined(DEBUG_DIRECTOR_EXCEPTION)
#include <iostream> #include <iostream>
#endif #endif
@ -384,4 +382,3 @@ namespace Swig {
} }
#endif /* __cplusplus */

3
Lib/ocaml/director.swg
View file

@ -6,8 +6,6 @@
* *
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
#ifdef __cplusplus
#include <string> #include <string>
# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG) # define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
@ -100,4 +98,3 @@ namespace Swig {
}; };
} }
#endif /* __cplusplus */

1
Lib/octave/director.swg
View file

@ -5,7 +5,6 @@
* methods can be called from C++. * methods can be called from C++.
* ----------------------------------------------------------------------------- */ * ----------------------------------------------------------------------------- */
# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG) # define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
namespace Swig { namespace Swig {

6
Lib/perl5/director.swg
View file

@ -8,8 +8,6 @@
#ifndef SWIG_DIRECTOR_PERL_HEADER_ #ifndef SWIG_DIRECTOR_PERL_HEADER_
#define SWIG_DIRECTOR_PERL_HEADER_ #define SWIG_DIRECTOR_PERL_HEADER_
#ifdef __cplusplus
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
@ -316,7 +314,5 @@ namespace Swig {
} }
#endif /* __cplusplus */
#endif #endif

4
Lib/php/director.swg
View file

@ -8,8 +8,6 @@
#ifndef SWIG_DIRECTOR_PHP_HEADER_ #ifndef SWIG_DIRECTOR_PHP_HEADER_
#define SWIG_DIRECTOR_PHP_HEADER_ #define SWIG_DIRECTOR_PHP_HEADER_
#ifdef __cplusplus
#include <string> #include <string>
#include <map> #include <map>
@ -171,6 +169,4 @@ namespace Swig {
// so use a macro to insert TSRMLS_CC so any ZTS context gets passed. // so use a macro to insert TSRMLS_CC so any ZTS context gets passed.
#define DirectorMethodException() DirectorMethodException("" TSRMLS_CC) #define DirectorMethodException() DirectorMethodException("" TSRMLS_CC)
#endif /* __cplusplus */
#endif #endif

5
Lib/python/director.swg
View file

@ -8,8 +8,6 @@
#ifndef SWIG_DIRECTOR_PYTHON_HEADER_ #ifndef SWIG_DIRECTOR_PYTHON_HEADER_
#define SWIG_DIRECTOR_PYTHON_HEADER_ #define SWIG_DIRECTOR_PYTHON_HEADER_
#ifdef __cplusplus
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <exception> #include <exception>
@ -432,7 +430,4 @@ namespace Swig {
#endif #endif
} }
#endif /* __cplusplus */
#endif #endif

5
Lib/ruby/director.swg
View file

@ -15,8 +15,6 @@
#endif #endif
#endif #endif
#ifdef __cplusplus
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <map> #include <map>
@ -341,6 +339,3 @@ namespace Swig {
}; };
} }
#endif /* __cplusplus */

3
Source/CParse/parser.y
View file

@ -2024,6 +2024,9 @@ module_directive: MODULE options idstring {
Setattr($$,"options",$2); Setattr($$,"options",$2);
if (Getattr($2,"directors")) { if (Getattr($2,"directors")) {
Wrapper_director_mode_set(1); Wrapper_director_mode_set(1);
if (!cparse_cplusplus) {
Swig_error(cparse_file, cparse_line, "Directors are not supported for C code and require the -c++ option\n");
}
} }
if (Getattr($2,"dirprot")) { if (Getattr($2,"dirprot")) {
Wrapper_director_protected_mode_set(1); Wrapper_director_protected_mode_set(1);