The great merge

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@4141 626c5289-ae23-0410-ae9c-e8d60b6d4f22

1 files changed, 53 insertions, 0 deletions

diff --git a/Examples/test-suite/static_const_member_2.i b/Examples/test-suite/static_const_member_2.i
new file mode 100644
index 000000000..3bd08b820
--- /dev/null
+++ b/Examples/test-suite/static_const_member_2.i
@@ -0,0 +1,53 @@
+%module static_const_member_2
+
+%warnfilter(801) oss::modules::CavityPackFlags::forward_field;
+%warnfilter(801) oss::modules::CavityPackFlags::backward_field;
+%warnfilter(801) oss::modules::Test::current_profile;
+
+%inline %{ 
+ namespace oss 
+ {   
+   namespace modules
+   {
+     struct CavityPackFlags 
+     {
+       typedef unsigned int viewflags;
+       static const viewflags forward_field  = 1 << 0;
+       static const viewflags backward_field = 1 << 1;
+       static const viewflags cavity_flags;
+       static viewflags flags;
+       static const int &reftest;
+     };     
+
+     template <class T>
+     struct Test : CavityPackFlags
+     {
+       enum {LeftIndex, RightIndex};
+       static const viewflags current_profile  = 1 << 2;
+     };
+   }
+ }
+
+%} 
+
+%{
+
+int refvalue = 42;
+const int &oss::modules::CavityPackFlags::reftest = refvalue;
+
+%}
+
+%{
+  using oss::modules::CavityPackFlags;
+  
+  const CavityPackFlags::viewflags 
+    CavityPackFlags::cavity_flags = 
+    CavityPackFlags::forward_field | CavityPackFlags::backward_field;
+
+  CavityPackFlags::viewflags 
+    CavityPackFlags::flags = 0;
+
+%}
+
+%template(Test_int) oss::modules::Test<int>;
+