fix bug #1263457

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

SWIG/CHANGES.current

@@ -5,6 +5,7 @@ Version 1.3.29 (In progress)
 
 	    Fix all the errors reported for 1.3.28.
 	    
+	    - fix bug #1263457
 	    - fix 'const  char*&' typemap in the UTL, reported by Geoff Hutchison
 	    - fixes for python 2.1 and the runtime library
 	    - fix copyctor + template bug #1432125

SWIG/Examples/test-suite/using_namespace.i

@@ -57,3 +57,20 @@ namespace hello
   }
   
 %}
+
+
+%inline {
+namespace foo {
+  typedef double mytype;
+};
+
+// global namespace
+typedef float mytype;
+
+using namespace foo;
+
+struct X {
+  ::mytype d;
+};
+
+}

SWIG/Lib/typemaps/swigmacros.swg

@@ -130,10 +130,10 @@ nocppval
 #endif
 
 #if defined(__cplusplus) && defined(SWIG_CPLUSPLUS_CAST)
-# define %const_cast(a,Type...)       const_cast<Type >(a)
-# define %static_cast(a,Type...)      static_cast<Type >(a)
-# define %reinterpret_cast(a,Type...) reinterpret_cast<Type >(a)
-# define %numeric_cast(a,Type...)     static_cast<Type >(a)
+# define %const_cast(a,Type...)       const_cast< Type >(a)
+# define %static_cast(a,Type...)      static_cast< Type >(a)
+# define %reinterpret_cast(a,Type...) reinterpret_cast< Type >(a)
+# define %numeric_cast(a,Type...)     static_cast< Type >(a)
 #else /* C case */
 # define %const_cast(a,Type...)       (Type)(a)
 # define %static_cast(a,Type...)      (Type)(a)

SWIG/Source/Modules/typepass.cxx

@@ -582,7 +582,7 @@ class TypePass : private Dispatcher {
       SwigType *t = Copy(ty);
       {
 	/* If the typename is qualified, make sure the scopename is fully qualified when making a typedef */
-	if (Swig_scopename_check(t)) {
+	if (Swig_scopename_check(t) && strncmp(Char(t),"::",2)) {
 	  String *base, *prefix, *qprefix;
 	  base = Swig_scopename_last(t);
 	  prefix = Swig_scopename_prefix(t);

SWIG/Source/Swig/typesys.c

@@ -846,6 +846,11 @@ SwigType *SwigType_typedef_qualified(SwigType *t)
   List   *elements;
   String *result;
   int     i,len;
+
+  if (t && strncmp(Char(t),"::",2) == 0) {
+    return Copy(t);
+  }
+  
   if (!typedef_qualified_cache) typedef_qualified_cache = NewHash();
   result = HashGetAttr(typedef_qualified_cache,t);
   if (result) {