diff options
| author | William S Fulton <wsf@fultondesigns.co.uk> | 2013-12-14 15:12:07 +0000 |
|---|---|---|
| committer | William S Fulton <wsf@fultondesigns.co.uk> | 2013-12-14 15:12:07 +0000 |
| commit | 314fae460b83389b87a83e003bfbc28271c495c1 (patch) | |
| tree | aae5d33c0dd3bb4268a2c273716578350f66b36b /Source/Makefile.am | |
| parent | 4cf5de797f15fa0c2a500cea12db7c9223f07fdc (diff) | |
| parent | 0f4ceaf5923fd9a30eb9201048cd285a9bba8084 (diff) | |
| download | swig-314fae460b83389b87a83e003bfbc28271c495c1.tar.gz | |
Merge branch 'nested' - nested structs/classes support
* nested:
Deprecation of the 'nestedworkaround' feature
Ensure -c++out is not used with -c++
Add missing header to new source file
Nested C class setters restored in c++out mode for Octave
Classprefix fixed after private nested classes some comments and spaces added
Fix template partial specialization detection
Minor tweaks in Swig_feature_set
Swig_offset_string moved to misc.c
nested private classes are discarded while parsing nested relate functions are moved to nested.cxx and renamed accordingly
out-of-scope template definitions fixed nested_private test disabled again
fixed out-of-scope nested class definitions, added a test enabled nested C structs assignment (still disabled for Octave), added Java runtime test fixed nested_private test case for Java & C#
Testcase of private nested class usage causing segfault
C nested struct passed by value example
Add in Travis testing for nested branch
Add C++ nested class example
Minor code improvements
Cosmetics/code beautification of nested class support
Nested classes support
Diffstat (limited to 'Source/Makefile.am')
| -rw-r--r-- | Source/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/Makefile.am b/Source/Makefile.am index 0c28a95b6..49d571236 100644 --- a/Source/Makefile.am +++ b/Source/Makefile.am @@ -54,6 +54,7 @@ eswig_SOURCES = CParse/cscanner.c \ Modules/modula3.cxx \ Modules/module.cxx \ Modules/mzscheme.cxx \ + Modules/nested.cxx \ Modules/ocaml.cxx \ Modules/octave.cxx \ Modules/overload.cxx \ |