diff --git a/Doc/Manual/C.html b/Doc/Manual/C.html index 84a626c1d..07ae63de5 100644 --- a/Doc/Manual/C.html +++ b/Doc/Manual/C.html @@ -422,13 +422,20 @@ area: 7.068583 Used for - proxy - Parameter types of proxy functions + ctype + Provides types used for the C API and
+ Typecasts wrapper functions return values in proxy functions
+ + MyClass *MyClass_new(void) {
+  return (MyClass *)_wrap_MyClass_new();
+ } +
+ - ctype - Parameter types of wrapper functions and
- Casts of functions' parameters of wrapper function calls
+ cmodtype + Provides types used by wrapper functions and
+ Casts of function parameters of wrapper function calls

extern void _wrap_MyClass_delete(SwigObj *o);
@@ -441,7 +448,7 @@ area: 7.068583 in - Mapping of wrapper functions' parameters to local C++ variables
+ Mapping of wrapper functions parameters to local C++ variables

SwigObj* _wrap_MyClass_do(SwigObj *carg1) {
@@ -453,31 +460,9 @@ area: 7.068583 }
- - couttype - Return value type of wrapper functions
-
- - SwigObj* _wrap_MyClass_new(void) {
-  SwigObj *result;
-  return result;
- } -
- - - - proxycouttype - Typecasts wrapper functions' return values in proxy functions
- - MyClass *MyClass_new(void) {
-  return (MyClass *)_wrap_MyClass_new();
- } -
- - out - Assigns wrapped function's return value to return variable, packaging it into SwigObj if necessary + Assigns wrapped function's return value to a dedicated return variable, packaging it into SwigObj if necessary cppouttype @@ -551,7 +536,7 @@ SWIGEXPORTC SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2) { } arg2 = (int) carg2; { - const int &_result_ref = someFunction(*arg1,arg2);cppresult = (int*) &_result_ref; + const SomeClass &_result_ref = someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref; } { result = (SwigObj*) SWIG_create_object(SWIG_STR(SomeClass)); @@ -580,7 +565,7 @@ A typical wrapper will be composited with these [optional] blocks: Let's go through it step by step and start with the wrapper prototype
-couttype                     ctype            ctype
+cmodtype                     cmodtype         cmodtype
 ---------                    ---------        ---
 SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2);
 
@@ -588,7 +573,7 @@ SwigObj * _wrap_someFunction(SwigObj * carg1, int carg2); As first unit of the wrapper code, a variable to hold the return value of the function is emitted to the wrapper's body
-couttype
+cmodtype
 ---------
 SwigObj * result;
 
@@ -630,7 +615,7 @@ At this point we are ready to call the C++ function with our parameters.

 {
-  const int &_result_ref =  someFunction(*arg1,arg2);cppresult = (int*) &_result_ref;
+  const SomeClass &_result_ref =  someFunction(*arg1,arg2);cppresult = (SomeClass*) &_result_ref;
 }
 
Subsequently, the return value is assigned to the dedicated return value variable using the 'out' typemap @@ -678,7 +663,7 @@ SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2) { Again, let's first examine the protype:
-proxycouttype           proxy                        proxy
+ctype                   ctype                        ctype
 ----------              ---------------------        ---
 SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2);
 
@@ -686,8 +671,8 @@ SomeClass* someFunction(SomeIntTemplateClass* carg1, int carg2); In the body of this function, we'll reuse the 'proxycouttype' and 'ctype' to cast the return value and arguments of the wrapper function.
-        proxycouttype                  ctype
-        ----------                     ---------
+        ctype                          cmodtype          cmodtype
+        ----------                     ---------         ___
 return (SomeClass*)_wrap_someFunction((SwigObj *)carg1, (int)carg2);