From 0cfccf817f766757ce0311c8d59b89247059ff47 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Fri, 28 Nov 2008 23:33:37 +0000 Subject: [PATCH] move iadd.h contents into iadd.i git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10957 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- Examples/test-suite/iadd.i | 54 ++++++++++++++++++++++++++++--- Examples/test-suite/python/iadd.h | 47 --------------------------- 2 files changed, 50 insertions(+), 51 deletions(-) delete mode 100644 Examples/test-suite/python/iadd.h diff --git a/Examples/test-suite/iadd.i b/Examples/test-suite/iadd.i index 76604c027..514bd3e4f 100644 --- a/Examples/test-suite/iadd.i +++ b/Examples/test-suite/iadd.i @@ -1,12 +1,58 @@ %module iadd %include attribute.i -%{ -#include "iadd.h" -%} class Foo; %attribute_ref(test::Foo, test::A& , AsA); %attribute_ref(test::Foo, long, AsLong); -%include "iadd.h" +%inline %{ +struct B { + int x; + B(const int x) : x(x) {} + + B& get_me() + { + return *this; + } + + B& operator+=(const B& a) { + x += a.x; + return *this; + } +}; + + + +namespace test { + +struct A { + int x; + A(const int x) : x(x) {} + + A& get_me() + { + return *this; + } + + A operator+=(const A& a) { + x += a.x; + return *this; + } +}; + + +class Foo { +public: + Foo(): _a(new A(5)), _n(new long) {} + ~Foo() { delete _a; delete _n; _a = NULL; _n = NULL; } + + A & AsA() const { return *_a; } + long& AsLong() const { return *_n; } +private: + A *_a; + long *_n; +}; +} + +%} diff --git a/Examples/test-suite/python/iadd.h b/Examples/test-suite/python/iadd.h deleted file mode 100644 index 367eda26f..000000000 --- a/Examples/test-suite/python/iadd.h +++ /dev/null @@ -1,47 +0,0 @@ -struct B { - int x; - B(const int x) : x(x) {} - - B& get_me() - { - return *this; - } - - B& operator+=(const B& a) { - x += a.x; - return *this; - } -}; - - - -namespace test { - -struct A { - int x; - A(const int x) : x(x) {} - - A& get_me() - { - return *this; - } - - A operator+=(const A& a) { - x += a.x; - return *this; - } -}; - - -class Foo { -public: - Foo(): _a(new A(5)), _n(new long) {} - ~Foo() { delete _a; delete _n; _a = NULL; _n = NULL; } - - A & AsA() const { return *_a; } - long& AsLong() const { return *_n; } -private: - A *_a; - long *_n; -}; -}