diff options
author | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-07-31 22:52:41 +0000 |
---|---|---|
committer | Jan Jezabek <jezabek@poczta.onet.pl> | 2008-07-31 22:52:41 +0000 |
commit | 66ab62095fd4461cd882f350fecb5406feae0af8 (patch) | |
tree | 92850698c9b74ea3fb76c5c459edd4fda034f9d1 /Source/Modules | |
parent | cc315edf4d30b6393fa708ee42741edcb50da81d (diff) | |
download | swig-66ab62095fd4461cd882f350fecb5406feae0af8.tar.gz |
Reverted accidental changes to Java module. Added typemaps for most basic types. Added typemaps for char * - mapped to OLE BSTR. Fixed a build problem with the test suite which prevented cases without a run test from building.
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/gsoc2008-jezabek@10724 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Source/Modules')
-rw-r--r-- | Source/Modules/com.cxx | 3 | ||||
-rw-r--r-- | Source/Modules/java.cxx | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Source/Modules/com.cxx b/Source/Modules/com.cxx index d347cb24b..3ed0c2a1a 100644 --- a/Source/Modules/com.cxx +++ b/Source/Modules/com.cxx @@ -372,6 +372,7 @@ public: /* Register file targets with the SWIG file handler */ Swig_register_filebyname("header", f_header); + Swig_register_filebyname("wrapper", f_wrappers); Swig_register_filebyname("runtime", f_runtime); Swig_register_filebyname("factory", f_factory); @@ -1118,7 +1119,7 @@ public: *Char(wanted_base) ? wanted_base : "", " {", NIL); */ Printv(proxy_class_def, "),\n dual\n ]\n interface $comclassname : ", - *Char(wanted_base) ? wanted_base : "IDispatch", " {", NIL); + *Char(wanted_base) ? wanted_base : "IDispatch", " {\n", NIL); Delete(attributes); diff --git a/Source/Modules/java.cxx b/Source/Modules/java.cxx index 120b7c39c..b92fccdfb 100644 --- a/Source/Modules/java.cxx +++ b/Source/Modules/java.cxx @@ -2658,16 +2658,12 @@ public: Node *n = enumLookup(t); if (n) { String *symname = Getattr(n, "sym:name"); - Printf(stdout, "symname: %s\n", symname); if (symname) { // Add in class scope when referencing enum if not a global enum String *scopename_prefix = Swig_scopename_prefix(Getattr(n, "name")); - Printf(stdout, "scopename_prefix: %s\n", scopename_prefix); - String *proxyname = 0; if (scopename_prefix) { proxyname = getProxyName(scopename_prefix); - Printf(stdout, "proxyname: %s\n", proxyname); } if (proxyname) { const char *class_separator = jnidescriptor ? "$" : "."; @@ -2675,7 +2671,6 @@ public: } else { enum_name = NewStringf("%s", symname); } - Printf(stdout, "enum_name: %s\n", enum_name); Delete(scopename_prefix); } } |