projects
/
SXSI
/
xpathcomp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update compilation flag:
[SXSI/xpathcomp.git]
/
src
/
common_stub.hpp
diff --git
a/src/common_stub.hpp
b/src/common_stub.hpp
index
bfacdac
..
47b6dcd
100644
(file)
--- a/
src/common_stub.hpp
+++ b/
src/common_stub.hpp
@@
-3,7
+3,7
@@
extern "C" {
#define CAML_NAME_SPACE
extern "C" {
#define CAML_NAME_SPACE
-#include <stdlib.h>
+
#include <caml/mlvalues.h>
#include <caml/alloc.h>
#include <caml/memory.h>
#include <caml/mlvalues.h>
#include <caml/alloc.h>
#include <caml/memory.h>
@@
-11,48
+11,49
@@
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 <stdio.h>
}
}
-#include <iostream>
#include <typeinfo>
#include <typeinfo>
+
void register_custom_(char* name,
size_t size,
void (*finalize)(value v));
value alloc_custom_(char* name);
void register_custom_(char* name,
size_t size,
void (*finalize)(value v));
value alloc_custom_(char* name);
+template <class X> X& Obj_val(value v)
+{
+ return * (X*) Data_custom_val(v);
+}
+
+template <class X> void sxsi_finalize_obj(X) {
+}
+
+template <class X> void sxsi_finalize_obj(X* x){
+ delete x;
+}
template <class X> void sxsi_finalize_custom(value v)
{
template <class X> void sxsi_finalize_custom(value v)
{
- X * obj = * ((X **) Data_custom_val(v));
- std::cerr << "Finalizing object: " << typeid(X).name() << std::endl;
- std::cerr.flush();
- delete obj;
+ sxsi_finalize_obj(Obj_val<X>(v));
}
}
-template <class X> value sxsi_alloc_custom()
+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());
+
value v = alloc_custom_(name);
if (v == Val_unit) {
value v = alloc_custom_(name);
if (v == Val_unit) {
- register_custom_(name, sizeof(X
*), sxsi_finalize_custom<X>
);
+ register_custom_(name, sizeof(X
), finalize
);
v = alloc_custom_(name);
};
return v;
}
v = alloc_custom_(name);
};
return v;
}
-template <class X> X*& Obj_val(value v)
-{
- //Cannot use Data_custom_val here, it is not a correct lvalue. :-(
- return (X*&) Field(v,1);
-}
-
void sxsi_raise_msg(char * msg);
void sxsi_raise_msg(char * msg);
-extern "C" {
-value sxsi_cpp_init(value unit);
-}
+extern "C" value sxsi_cpp_init(value unit);
+
#endif
#endif