Merge branch 'typedef-namespace'

* typedef-namespace:
  Partial revert of previous commit for typedefs
  add an unit test
  tentative fix for typedef/using declaration to struct typedef

Conflicts:
	CHANGES.current

1 files changed, 3 insertions, 3 deletions

diff --git a/Source/Swig/symbol.c b/Source/Swig/symbol.c
index 7c7c4d100..8e24c9ec7 100644
--- a/Source/Swig/symbol.c
+++ b/Source/Swig/symbol.c
@@ -839,10 +839,10 @@ Node *Swig_symbol_add(const_String_or_char_ptr symname, Node *n) {
 
       /* Hmmm.  This appears to be okay.  Make sure the symbol table refers to the allow_type node */
 
-      if (td != c) {
+      Setattr(n, "sym:symtab", current_symtab);
+      Setattr(n, "sym:name", symname);
+      if (td == n) {
 	Setattr(current, symname, td);
-	Setattr(td, "sym:symtab", current_symtab);
-	Setattr(td, "sym:name", symname);
       }
       return n;
     }