From: <ian...@us...> - 2010-06-15 17:58:48
|
Revision: 12126 http://swig.svn.sourceforge.net/swig/?rev=12126&view=rev Author: ianlancetaylor Date: 2010-06-15 17:58:42 +0000 (Tue, 15 Jun 2010) Log Message: ----------- Use a single extern "C" around all the wrappers, not one per wrapper. Modified Paths: -------------- trunk/Source/Modules/go.cxx Modified: trunk/Source/Modules/go.cxx =================================================================== --- trunk/Source/Modules/go.cxx 2010-06-15 17:57:05 UTC (rev 12125) +++ trunk/Source/Modules/go.cxx 2010-06-15 17:58:42 UTC (rev 12126) @@ -385,6 +385,10 @@ Printf(f_go_begin, "\npackage %s\n\n", package); + // All the C++ wrappers should be extern "C". + + Printv(f_c_wrappers, "#ifdef __cplusplus\n", "extern \"C\" {\n", "#endif\n\n", NULL); + // Set up the hash table for types not defined by SWIG. undefined_types = NewHash(); @@ -433,6 +437,9 @@ f_c_directors = NULL; } + // End the extern "C". + Printv(f_c_wrappers, "#ifdef __cplusplus\n", "}\n", "#endif\n\n", NULL); + Dump(f_c_runtime, f_c_begin); Dump(f_c_wrappers, f_c_begin); Dump(f_c_init, f_c_begin); @@ -1149,8 +1156,6 @@ // Start the function definition. - Printv(f->def, "#ifdef __cplusplus\n", "extern \"C\"\n", "#endif\n", NULL); - Printv(f->def, "void\n", wname, "(void *swig_v)\n", "{\n", NULL); // The single function parameter is a pointer to the real argument @@ -1269,8 +1274,6 @@ // Start the function definition. - Printv(f->def, "#ifdef __cplusplus\n", "extern \"C\"\n", "#endif\n", NULL); - String *fnname = NewString(""); Printv(fnname, go_prefix, "_", wname, "(", NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |