Merge branch 'master' of git://factorcode.org/git/factor

Joe Groff 2009-07-27 13:24:23 -05:00
commit 7c8503989f
2 changed files with 3 additions and 3 deletions

View File

@ -40,7 +40,7 @@ COMPILE-AS-C++
C-INCLUDE: <cstring>
RAW-C:
<RAW-C
class alpha {
public:
alpha(const char* s) {
@ -68,7 +68,7 @@ class beta : alpha {
return str + 2;
};
};
;
RAW-C>
C++-CLASS: alpha c++-root
C++-CLASS: beta alpha

View File

@ -604,7 +604,7 @@ ARTICLE: "alien.marshall" "C marshalling"
"Wrap an alien:" { $subsection alien-wrapper }
"Wrap a struct:" { $subsection struct-wrapper }
"Get the marshaller for a C type:" { $subsection marshaller }
"Get the unmarshaller for a C type:" { $subsection marshaller }
"Get the unmarshaller for a C type:" { $subsection unmarshaller }
"Get the unmarshaller for an output parameter:" { $subsection out-arg-unmarshaller }
"Get the unmarshaller for a struct field:" { $subsection struct-field-unmarshaller }
$nl