Modified forb_init_attr to be C++ compatible

diff --git a/src/forb.h b/src/forb.h
index 9a1e00e86c47086bde1269fbbd7ab1580d7455f8..60d6842c998fbd5a57438c89a6c817ff196a7328 100644 (file)
--- a/src/forb.h
+++ b/src/forb.h
@@ -155,7 +155,7 @@ struct forb_interface;
 typedef struct forb_interface forb_interface_t;
 
 typedef struct forb_init_attr {
-       char *orb_id;           /**< Name of the FORB used for debugging purposes */
+       const char *orb_id;             /**< Name of the FORB used for debugging purposes */
        void (*peer_discovery_callback)(const forb_orb peer_orb, const char *orb_id);
        void (*peer_dead_callback)(const forb_orb peer_orb, const char *orb_id);
        uint16_t fixed_tcp_port; /**< If we want FORB's inet protocol to listen on a fixed port... */

diff --git a/src/iop.c b/src/iop.c
index 74d817c67b62b24df987848bcaf166f001050cdc..95c0443f54fd485070a092b1e39d3ec14910f056 100644 (file)
--- a/src/iop.c
+++ b/src/iop.c
@@ -120,7 +120,7 @@ forb_iop_prepare_hello(FORB_CDR_Codec *codec,
                       const forb_server_id *server_id,
                       const void *src_addr,
                       CORBA_boolean (*serialize_addr)(FORB_CDR_Codec *codec, const void *addr),
-                      const CORBA_string orb_id)
+                      const CORBA_char *orb_id)
 {
        if (!forb_server_id_serialize(codec, server_id)) return CORBA_FALSE;
        if (serialize_addr) {