diff options
| -rw-r--r-- | common/distrio_helper.cpp | 4 | ||||
| -rw-r--r-- | common/distrio_helper.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/distrio_helper.cpp b/common/distrio_helper.cpp index 5a0d5df..07ac538 100644 --- a/common/distrio_helper.cpp +++ b/common/distrio_helper.cpp @@ -41,7 +41,7 @@ out: return ret; } -int register_digital (char *_name, Distrio_Digital_i *digital) +int register_digital (std::string _name, Distrio_Digital_i *digital) { CosNaming::Name name; CORBA::Object_var obj, manager_obj; @@ -58,7 +58,7 @@ int register_digital (char *_name, Distrio_Digital_i *digital) oid = ref.poa->activate_object (digital); obj = digital->_this (); name.length (1); - name[0].id = CORBA::string_dup (_name); + name[0].id = CORBA::string_dup (_name.c_str ()); name[0].kind = CORBA::string_dup ("digital_io"); ref.nc->rebind (name, obj.in ()); } catch (CORBA::Exception &e) { diff --git a/common/distrio_helper.h b/common/distrio_helper.h index 0d2d145..7bad2de 100644 --- a/common/distrio_helper.h +++ b/common/distrio_helper.h @@ -37,6 +37,6 @@ static corba_ref ref = { /** initialize corba orb - argc, argv as passed to main() */ int init_corba (int argc, char **argv); /** register a digital io with a common name at the naming service */ -int register_digital (char *_name, Distrio_Digital_i *digital); +int register_digital (std::string _name, Distrio_Digital_i *digital); /** run the orb - function blocks until orb shutdown */ int run_orb (void); |