-
Notifications
You must be signed in to change notification settings - Fork 28
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SWIG 4 Template Directive Changes (#1741)
* Updated convert_swig to account for template directive changes in SWIG 4 * Fixed merge issues * Merge cleanup
- Loading branch information
1 parent
7b4253d
commit a9aa708
Showing
8 changed files
with
273 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /********************************* TRICK HEADER ******************************* | ||
| PURPOSE: | ||
| () | ||
| LIBRARY DEPENDENCY: | ||
| () | ||
| PROGRAMMERS: | ||
| (((Your Name) (Company Name) (Date) (Trick tutorial))) | ||
| *******************************************************************************/ | ||
|
|
||
| #ifndef FOOB_HH_ | ||
| #define FOOB_HH_ | ||
|
|
||
| namespace FooNamespace | ||
| { | ||
|
|
||
| // RestartableStateIntegrator | ||
| template<int T> | ||
| class FooA | ||
| { | ||
| public: | ||
|
|
||
| int A = T; | ||
| }; | ||
|
|
||
| // RestartableFirstOrderODEIntegrator | ||
| template<int T> | ||
| class FooB : public FooA<3> | ||
| { | ||
| public: | ||
| int B = T; | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /********************************* TRICK HEADER ******************************* | ||
| PURPOSE: | ||
| () | ||
| LIBRARY DEPENDENCY: | ||
| () | ||
| PROGRAMMERS: | ||
| (((Your Name) (Company Name) (Date) (Trick tutorial))) | ||
| *******************************************************************************/ | ||
|
|
||
| #ifndef FOOD_HH_ | ||
| #define FOOD_HH_ | ||
|
|
||
| #include "FooB.hh" | ||
|
|
||
| namespace FooNamespace | ||
| { | ||
|
|
||
| // RestartableSecondOrderODEIntegrator | ||
| class FooC : public FooA<1> | ||
| { | ||
| public: | ||
| int C; | ||
| }; | ||
|
|
||
| // RestartableSimpleSecondOrderODEIntegrator | ||
| template<int T> | ||
| class FooD : public FooC | ||
| { | ||
| public: | ||
| int D = T; | ||
| }; | ||
|
|
||
|
|
||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /********************************* TRICK HEADER ******************************* | ||
| PURPOSE: | ||
| () | ||
| LIBRARY DEPENDENCY: | ||
| () | ||
| PROGRAMMERS: | ||
| (((Your Name) (Company Name) (Date) (Trick tutorial))) | ||
| *******************************************************************************/ | ||
|
|
||
| #ifndef FOO_HH_ | ||
| #define FOO_HH_ | ||
|
|
||
| #include "FooB.hh" | ||
| #include "FooD.hh" | ||
|
|
||
| namespace FooNamespace | ||
| { | ||
|
|
||
| // RestartableScalarFirstOrderODEIntegrator | ||
| class FooContB { | ||
| public: | ||
| FooContB() : d(12.0) {} | ||
|
|
||
| // RestartableFirstOrderODEIntegrator | ||
| FooB<2> fooB; | ||
|
|
||
| FooB<2> fooB2; | ||
|
|
||
| double d; | ||
| }; | ||
|
|
||
|
|
||
| // RestartableT3SecondOrderODEIntegrator | ||
| class FooContD { | ||
| public: | ||
| FooContD() : d(12.0) {} | ||
|
|
||
| // RestartableSimpleSecondOrderODEIntegrator | ||
| #ifndef TESTING_SWIG | ||
| # ifndef SWIG | ||
| // THIS SHOULD PREVENT SWIG FROM MAKING ANY TEMPLATE REFERENCES TO EXCLUDED FooD TYPE | ||
| FooD<1> fooD; | ||
|
|
||
| FooD<2> fooD2; | ||
| #endif | ||
| #endif | ||
|
|
||
| int spacer; | ||
|
|
||
| #if ! defined ( SWIG ) | ||
| // THIS SHOULD PREVENT SWIG FROM MAKING ANY TEMPLATE REFERENCES TO EXCLUDED FooD TYPE | ||
| FooD<3> fooD3; | ||
|
|
||
| FooD<4> fooD4; | ||
| #endif | ||
|
|
||
| double d; | ||
| }; | ||
|
|
||
| } | ||
|
|
||
| #endif |
Oops, something went wrong.