From 45fb27f977dbccb1eede3dfd427a38d384f07641 Mon Sep 17 00:00:00 2001
From: Marcelo Matus <mmatus@acms.arizona.edu>
Date: Sat, 18 Jun 2005 08:04:30 +0000
Subject: [PATCH] fix for #1205859

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7306 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 Examples/test-suite/common.mk          |  1 +
 Examples/test-suite/extern_namespace.i | 23 ++++++++++
 Source/Modules/lang.cxx                | 59 ++++++++++++++------------
 3 files changed, 55 insertions(+), 28 deletions(-)
 create mode 100644 Examples/test-suite/extern_namespace.i

diff --git a/Examples/test-suite/common.mk b/Examples/test-suite/common.mk
index 201a8d8fa..f00df7534 100644
--- a/Examples/test-suite/common.mk
+++ b/Examples/test-suite/common.mk
@@ -138,6 +138,7 @@ CPP_TEST_CASES += \
 	extend_placement \
 	extend_template \
 	extend_template_ns \
+	extern_namespace \
 	extern_throws \
 	features \
 	friends \
diff --git a/Examples/test-suite/extern_namespace.i b/Examples/test-suite/extern_namespace.i
new file mode 100644
index 000000000..51d99f53e
--- /dev/null
+++ b/Examples/test-suite/extern_namespace.i
@@ -0,0 +1,23 @@
+%module extern_namespace
+%inline %{
+
+  namespace foo {
+    
+    extern int bar(int blah = 1);
+    
+  };
+
+  extern "C" int foobar(int i) {
+    return i;
+  }
+  
+%}
+
+
+
+%{
+  int foo::bar(int blah) {
+    return blah;
+  }
+%}
+  
diff --git a/Source/Modules/lang.cxx b/Source/Modules/lang.cxx
index cb8b3204f..0baa32f7e 100644
--- a/Source/Modules/lang.cxx
+++ b/Source/Modules/lang.cxx
@@ -799,38 +799,41 @@ int Language::cDeclaration(Node *n) {
     /* Transform the node into a 'function' node and emit */
     if (!CurrentClass) {
       f_header = Swig_filebyname("header");
+      /* 
+	 in C++ mode we can't emit a extern declaration derived from
+	 the definition, for example, if we have
 
-      if (!NoExtern) {
-	if (f_header) {
-	  if ((Cmp(storage,"extern") == 0) || (ForceExtern && !storage)) {
-	    /* we don't need the 'extern' part in the C/C++ declaration,
-	       and it produces some problems when namespace and SUN
-	       Studio is used.
+	   --- foo.c ---
+	   int foo(int bar) {
+	   }
+	   --- foo.c ---
 
-	       Printf(f_header,"extern %s", SwigType_str(ty,name));
-	    */
-	    String *str = SwigType_str(ty,name);
-	    Printf(f_header,"%s", str);
-	    Delete(str);
-	    {
-	      DOH *t = Getattr(n,"throws");
-	      if (t) {
-		Printf(f_header,"throw(");
-		while (t) {
-		  Printf(f_header,"%s", Getattr(t,"type"));
-		  t = nextSibling(t);
-		  if (t) Printf(f_header,",");
-		}
-		Printf(f_header,")");
-	      }
+	 we could be tempted to declare
+
+	   extern int foo(int bar);
+
+	 but the real declaration could be:
+	 
+	   extern int foo(int bar = 1);
+
+	 hence, the user MUST provide the declaration, and swig
+	 shouldn't attempt to deduce it.
+      */
+      if (f_header) {
+	int extern_c = Cmp(storage,"externc") == 0;
+	int need_extern = CPlusPlus ? extern_c : 1;
+	if (!NoExtern && need_extern) {
+	  String *str = SwigType_str(ty,name);
+	  if ((storage && Strstr(storage,"extern")) || (ForceExtern && !storage)) {
+	    Printf(f_header,"extern ", str);
+	    if (extern_c) {
+	      /* here 'extern "C"' is needed */
+	      Printf(f_header, "\"C\" ");
 	    }
-	    Printf(f_header,";\n");
-	  } else if (Cmp(storage,"externc") == 0) {
-	    /* here 'extern "C"' is needed */
-	    String *str = SwigType_str(ty,name);
-	    Printf(f_header, "extern \"C\" %s;\n", str);
-	    Delete(str);
 	  }
+	  Printf(f_header,"%s", str);
+	  Delete(str);
+	  Printf(f_header,";\n");
 	}
       }
     }