projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use the code alignment macro also in lexindex_stub.cpp
[SXSI/xpathcomp.git]
/
src
/
common_stub.hpp
diff --git
a/src/common_stub.hpp
b/src/common_stub.hpp
index
438b5d2
..
b771f33
100644
(file)
--- a/
src/common_stub.hpp
+++ b/
src/common_stub.hpp
@@
-1,5
+1,5
@@
-#ifndef COMMON_STUB_H_
-#define COMMON_STUB_H_
+#ifndef COMMON_STUB_H
PP
_
+#define COMMON_STUB_H
PP
_
extern "C" {
#define CAML_NAME_SPACE
extern "C" {
#define CAML_NAME_SPACE
@@
-11,9
+11,16
@@
extern "C" {
#include <caml/fail.h>
#include <caml/custom.h>
#include <caml/bigarray.h>
#include <caml/fail.h>
#include <caml/custom.h>
#include <caml/bigarray.h>
-
}
#include <typeinfo>
}
#include <typeinfo>
+#include <cstdio>
+#include <cassert>
+
+#define NoAlloc
+
+//Must be used in front of every function that is called from OCaml.
+
+#define ML_BINDING extern "C" __attribute__ ((force_align_arg_pointer))
void register_custom_(char* name,
void register_custom_(char* name,
@@
-24,6
+31,7
@@
value alloc_custom_(char* name);
template <class X> X& Obj_val(value v)
{
template <class X> X& Obj_val(value v)
{
+ assert(Tag_val(v) == Custom_tag);
return * (X*) Data_custom_val(v);
}
return * (X*) Data_custom_val(v);
}
@@
-39,7
+47,8
@@
template <class X> void sxsi_finalize_custom(value v)
sxsi_finalize_obj(Obj_val<X>(v));
}
sxsi_finalize_obj(Obj_val<X>(v));
}
-template <class X> value sxsi_alloc_custom(void (*finalize)(value) = sxsi_finalize_custom<X>)
+template <class X> value
+sxsi_alloc_custom(void (*finalize)(value) = sxsi_finalize_custom<X>)
{
char * name = const_cast<char*>(typeid(X).name());
{
char * name = const_cast<char*>(typeid(X).name());
@@
-51,10
+60,9
@@
template <class X> value sxsi_alloc_custom(void (*finalize)(value) = sxsi_finali
return v;
}
return v;
}
-void sxsi_raise_msg(char * msg);
-
-extern "C" value sxsi_cpp_init(value unit);
+void sxsi_raise_msg(const char * msg);
+ML_BINDING value sxsi_cpp_init(value unit);
#endif
#endif