jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[OCaml] Define CAML_NAME_SPACE before including caml/ headers

Browse source 
When this macro is not defined, the caml/ headers will define
macros without the caml_ prefix as aliases for some functions in the
OCaml C API.

For example, caml/compatibility.h defines `invalid_argument` as an
alias for `caml_invalid_argument` when CAML_NAME_SPACE is not defined,
which breaks code that uses std::invalid_argument.

Rename some functions that were missed in
05589508a6.
This commit is contained in:
Zackery Spytz 2019-01-28 06:56:18 -07:00
commit 0b0b77f343
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/ocaml/cstring.i
View file

@ -108,7 +108,7 @@
%define %cstring_mutable(TYPEMAP,...) %define %cstring_mutable(TYPEMAP,...)
%typemap(in) TYPEMAP { %typemap(in) TYPEMAP {
char *t = String_val($input); char *t = String_val($input);
int n = string_length($input); int n = caml_string_length($input);
$1 = ($1_ltype) t; $1 = ($1_ltype) t;
#if #__VA_ARGS__ == "" #if #__VA_ARGS__ == ""
#ifdef __cplusplus #ifdef __cplusplus

4
Lib/ocaml/director.swg
View file

@ -74,12 +74,12 @@ namespace Swig {
public: public:
/* wrap a ocaml object. */ /* wrap a ocaml object. */
Director(CAML_VALUE self) : swig_self(self), swig_disown_flag(false) { Director(CAML_VALUE self) : swig_self(self), swig_disown_flag(false) {
register_global_root(&swig_self); caml_register_global_root(&swig_self);
} }
/* discard our reference at destruction */ /* discard our reference at destruction */
virtual ~Director() { virtual ~Director() {
remove_global_root(&swig_self); caml_remove_global_root(&swig_self);
swig_disown(); swig_disown();
// Disown is safe here because we're just divorcing a reference that points to us. // Disown is safe here because we're just divorcing a reference that points to us.
} }

2
Lib/ocaml/ocaml.swg
View file

@ -507,7 +507,7 @@ extern "C" {
SWIGINTERN int caml_string_len( CAML_VALUE v ) { SWIGINTERN int caml_string_len( CAML_VALUE v ) {
switch( SWIG_Tag_val(v) ) { switch( SWIG_Tag_val(v) ) {
case C_string: case C_string:
return string_length(SWIG_Field(v,0)); return caml_string_length(SWIG_Field(v,0));
default: default:
return strlen((char *)caml_ptr_val(v,0)); return strlen((char *)caml_ptr_val(v,0));
} }

1
Lib/ocaml/ocamldec.swg
View file

@ -16,6 +16,7 @@ SWIGEXT {
#endif #endif
#define value caml_value_t #define value caml_value_t
#define CAML_VALUE caml_value_t #define CAML_VALUE caml_value_t
#define CAML_NAME_SPACE
#include <caml/alloc.h> #include <caml/alloc.h>
#include <caml/custom.h> #include <caml/custom.h>
#include <caml/mlvalues.h> #include <caml/mlvalues.h>