hey all,
just so you know, i compiled orbitcpp against the current
development tree of orbit (or at least a relatively recently updated
orbit cvs tree). i didn't check in my changes since most people are
running it against the stable orbit (i'm a masochist, i know :-) ).
anyway, here's a patch to allow orbitcpp to compile against the orbit
in cvs:
Index: orbitcpp_tools.cc
===================================================================
RCS file: /cvsroot/orbitcpp/orbitcpp/orb/orbitcpp_tools.cc,v
retrieving revision 1.4
diff -u -r1.4 orbitcpp_tools.cc
--- orbitcpp_tools.cc 2000/04/26 12:53:45 1.4
+++ orbitcpp_tools.cc 2000/05/29 23:05:55
@@ -37,7 +37,9 @@
// tool functions -------------------------------------------------------------
char *_orbitcpp::get_repository_id(_orbitcpp::c::CORBA_Object obj) {
// *** FIXME: this is a goddamn hack. it relies on orbit implementation detail
- return obj->object_id;
+ // return obj->object_id;
+ // RG - dev ORBit-C changed object_id to type_id
+ return obj->type_id;
}
@@ -82,6 +84,8 @@
#ifdef ORBIT_DEBUG
block->magic = 0xdeadbeef;
#endif
- block->free = freefunc;
+ // block->free = freefunc;
+ //RG free changed to freekids in dev ORBit
+ block->freekids = freefunc;
block->func_data = reinterpret_cast<void*>(numElements);
}
|
