Menu
▾
▴
[Gearbox-commit] SF.net SVN: gearbox:[479] openrtm/trunk
|
From: <gb...@us...> - 2010-01-07 06:27:00
|
Revision: 479
http://gearbox.svn.sourceforge.net/gearbox/?rev=479&view=rev
Author: gbiggs
Date: 2010-01-07 06:26:50 +0000 (Thu, 07 Jan 2010)
Log Message:
-----------
Updates to make the components compile again
Modified Paths:
--------------
openrtm/trunk/flexiport/flexiport.hh
openrtm/trunk/flexiport/flexiportDynSK.cc
openrtm/trunk/flexiport/flexiportSK.cc
openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp
openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp
openrtm/trunk/hokuyo_aist/hokuyo_aist.h
openrtm/trunk/hokuyo_aist/hokuyo_aist.hh
openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc
openrtm/trunk/hokuyo_aist/hokuyo_aistSK.cc
Modified: openrtm/trunk/flexiport/flexiport.hh
===================================================================
--- openrtm/trunk/flexiport/flexiport.hh 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/flexiport/flexiport.hh 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,15 +1,14 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend)- omniORB_4_1. Do not edit.
#ifndef __flexiport_hh__
#define __flexiport_hh__
-#ifndef USE_omniORB_logStream
-#define USE_omniORB_logStream
-#endif
-
#ifndef __CORBA_H_EXTERNAL_GUARD__
#include <omniORB4/CORBA.h>
#endif
+#ifndef USE_stub_in_nt_dll
+# define USE_stub_in_nt_dll_NOT_DEFINED_flexiport
+#endif
#ifndef USE_core_stub_in_nt_dll
# define USE_core_stub_in_nt_dll_NOT_DEFINED_flexiport
#endif
@@ -23,13 +22,13 @@
#ifdef USE_stub_in_nt_dll
-#ifndef USE_core_stub_in_nt_dll
-#define USE_core_stub_in_nt_dll
+# ifndef USE_core_stub_in_nt_dll
+# define USE_core_stub_in_nt_dll
+# endif
+# ifndef USE_dyn_stub_in_nt_dll
+# define USE_dyn_stub_in_nt_dll
+# endif
#endif
-#ifndef USE_dyn_stub_in_nt_dll
-#define USE_dyn_stub_in_nt_dll
-#endif
-#endif
#ifdef _core_attr
# error "A local CPP macro _core_attr has already been defined."
@@ -82,6 +81,7 @@
#endif
+// interface flexiport_intf
class flexiport_intf {
public:
// Declarations for this interface type.
@@ -89,8 +89,9 @@
typedef flexiport_intf_var _var_type;
static _ptr_type _duplicate(_ptr_type);
- static _ptr_type _narrow(CORBA::Object_ptr);
- static _ptr_type _unchecked_narrow(CORBA::Object_ptr);
+ static _ptr_type _narrow(::CORBA::Object_ptr);
+ static _ptr_type _unchecked_narrow(::CORBA::Object_ptr);
+
static _ptr_type _nil();
static inline void _marshalObjRef(_ptr_type, cdrStream&);
@@ -106,10 +107,10 @@
static _core_attr const char* _PD_repoId;
// Other IDL defined within this scope.
- class PortException : public CORBA::UserException {
+ class PortException : public ::CORBA::UserException {
public:
- CORBA::String_member errorStr;
+ ::CORBA::String_member errorStr;
@@ -122,9 +123,9 @@
PortException& operator=(const PortException&);
virtual ~PortException();
virtual void _raise() const;
- static PortException* _downcast(CORBA::Exception*);
- static const PortException* _downcast(const CORBA::Exception*);
- static inline PortException* _narrow(CORBA::Exception* _e) {
+ static PortException* _downcast(::CORBA::Exception*);
+ static const PortException* _downcast(const ::CORBA::Exception*);
+ static inline PortException* _narrow(::CORBA::Exception* _e) {
return _downcast(_e);
}
@@ -134,7 +135,7 @@
static _core_attr insertExceptionToAny insertToAnyFn;
static _core_attr insertExceptionToAnyNCP insertToAnyFnNCP;
- virtual CORBA::Exception* _NP_duplicate() const;
+ virtual ::CORBA::Exception* _NP_duplicate() const;
static _core_attr const char* _PD_repoId;
static _core_attr const char* _PD_typeId;
@@ -145,21 +146,22 @@
virtual void _NP_marshal(cdrStream&) const;
};
- static _dyn_attr const CORBA::TypeCode_ptr _tc_PortException;
+ static _dyn_attr const ::CORBA::TypeCode_ptr _tc_PortException;
};
class _objref_flexiport_intf :
- public virtual CORBA::Object, public virtual omniObjRef
+ public virtual ::CORBA::Object,
+ public virtual omniObjRef
{
public:
void Flush();
void Drain();
char* GetStatus();
char* GetPortType();
- CORBA::Boolean IsBlocking();
- CORBA::Boolean IsOpen();
+ ::CORBA::Boolean IsBlocking();
+ ::CORBA::Boolean IsOpen();
inline _objref_flexiport_intf() { _PR_setobj(0); } // nil
_objref_flexiport_intf(omniIOR*, omniIdentity*);
@@ -197,8 +199,8 @@
virtual void Drain() = 0;
virtual char* GetStatus() = 0;
virtual char* GetPortType() = 0;
- virtual CORBA::Boolean IsBlocking() = 0;
- virtual CORBA::Boolean IsOpen() = 0;
+ virtual ::CORBA::Boolean IsBlocking() = 0;
+ virtual ::CORBA::Boolean IsOpen() = 0;
public: // Really protected, workaround for xlC
virtual _CORBA_Boolean _dispatch(omniCallHandle&);
@@ -206,16 +208,17 @@
private:
virtual void* _ptrToInterface(const char*);
virtual const char* _mostDerivedRepoId();
+
};
-_CORBA_GLOBAL_VAR _dyn_attr const CORBA::TypeCode_ptr _tc_flexiport_intf;
+_CORBA_GLOBAL_VAR _dyn_attr const ::CORBA::TypeCode_ptr _tc_flexiport_intf;
class POA_flexiport_intf :
public virtual _impl_flexiport_intf,
- public virtual PortableServer::ServantBase
+ public virtual ::PortableServer::ServantBase
{
public:
virtual ~POA_flexiport_intf();
@@ -229,16 +232,18 @@
+
+
#undef _core_attr
#undef _dyn_attr
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException& _s);
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException* _sp);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, const flexiport_intf::PortException*& _sp);
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException& _s);
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException* _sp);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, const flexiport_intf::PortException*& _sp);
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr _s);
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr* _s);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, flexiport_intf_ptr& _s);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr _s);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr* _s);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, flexiport_intf_ptr& _s);
@@ -250,6 +255,10 @@
+#ifdef USE_stub_in_nt_dll_NOT_DEFINED_flexiport
+# undef USE_stub_in_nt_dll
+# undef USE_stub_in_nt_dll_NOT_DEFINED_flexiport
+#endif
#ifdef USE_core_stub_in_nt_dll_NOT_DEFINED_flexiport
# undef USE_core_stub_in_nt_dll
# undef USE_core_stub_in_nt_dll_NOT_DEFINED_flexiport
Modified: openrtm/trunk/flexiport/flexiportDynSK.cc
===================================================================
--- openrtm/trunk/flexiport/flexiportDynSK.cc 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/flexiport/flexiportDynSK.cc 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,93 +1,78 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend) - omniORB_4_1. Do not edit.
#include "flexiport.hh"
-#include <omniORB4/tcDescriptor.h>
OMNI_USING_NAMESPACE(omni)
-static const char* _0RL_dyn_library_version = omniORB_4_0;
+static const char* _0RL_dyn_library_version = omniORB_4_1_dyn;
+static ::CORBA::TypeCode::_Tracker _0RL_tcTrack(__FILE__);
+
static CORBA::PR_structMember _0RL_structmember_flexiport__intf_mPortException[] = {
- {"errorStr", CORBA::TypeCode::PR_string_tc(0)}
+ {"errorStr", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)}
};
-static CORBA::TypeCode_ptr _0RL_tc_flexiport__intf_mPortException = CORBA::TypeCode::PR_exception_tc("IDL:flexiport_intf/PortException:1.0", "PortException", _0RL_structmember_flexiport__intf_mPortException, 1);
+static CORBA::TypeCode_ptr _0RL_tc_flexiport__intf_mPortException = CORBA::TypeCode::PR_exception_tc("IDL:flexiport_intf/PortException:1.0", "PortException", _0RL_structmember_flexiport__intf_mPortException, 1, &_0RL_tcTrack);
const CORBA::TypeCode_ptr flexiport_intf::_tc_PortException = _0RL_tc_flexiport__intf_mPortException;
-const CORBA::TypeCode_ptr _tc_flexiport_intf = CORBA::TypeCode::PR_interface_tc("IDL:flexiport_intf:1.0", "flexiport_intf");
+const CORBA::TypeCode_ptr _tc_flexiport_intf = CORBA::TypeCode::PR_interface_tc("IDL:flexiport_intf:1.0", "flexiport_intf", &_0RL_tcTrack);
- CORBA::Boolean
-_0RL_tcParser_getMemberDesc_flexiport__intf_mPortException(const tcStructDesc *_desc, CORBA::ULong _index, tcDescriptor &_newdesc){
- switch (_index) {
- case 0:
- _0RL_buildDesc_cstring(_newdesc, ((flexiport_intf::PortException*)_desc->opq_struct)->errorStr);
- return 1;
- default:
- return 0;
- };
+static void _0RL_flexiport__intf_mPortException_marshal_fn(cdrStream& _s, void* _v)
+{
+ const flexiport_intf::PortException* _p = (const flexiport_intf::PortException*)_v;
+ *_p >>= _s;
}
- CORBA::ULong
-
-_0RL_tcParser_getMemberCount_flexiport__intf_mPortException(const tcStructDesc *_desc)
+static void _0RL_flexiport__intf_mPortException_unmarshal_fn(cdrStream& _s, void*& _v)
{
- return 1;
+ flexiport_intf::PortException* _p = new flexiport_intf::PortException;
+ *_p <<= _s;
+ _v = _p;
}
-
-void _0RL_buildDesc_cflexiport__intf_mPortException(tcDescriptor &_desc, const flexiport_intf::PortException& _data)
+static void _0RL_flexiport__intf_mPortException_destructor_fn(void* _v)
{
- _desc.p_struct.getMemberDesc = _0RL_tcParser_getMemberDesc_flexiport__intf_mPortException;
- _desc.p_struct.getMemberCount = _0RL_tcParser_getMemberCount_flexiport__intf_mPortException;
- _desc.p_struct.opq_struct = (void *)&_data;
+ flexiport_intf::PortException* _p = (flexiport_intf::PortException*)_v;
+ delete _p;
}
-void _0RL_delete_flexiport__intf_mPortException(void* _data) {
- flexiport_intf::PortException* _0RL_t = (flexiport_intf::PortException*) _data;
- delete _0RL_t;
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException& _s)
+{
+ flexiport_intf::PortException* _p = new flexiport_intf::PortException(_s);
+ _a.PR_insert(_0RL_tc_flexiport__intf_mPortException,
+ _0RL_flexiport__intf_mPortException_marshal_fn,
+ _0RL_flexiport__intf_mPortException_destructor_fn,
+ _p);
}
-
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException& _s) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_cflexiport__intf_mPortException(_0RL_tcdesc, _s);
- _a.PR_packFrom(_0RL_tc_flexiport__intf_mPortException, &_0RL_tcdesc);
+void operator<<=(::CORBA::Any& _a, const flexiport_intf::PortException* _sp)
+{
+ _a.PR_insert(_0RL_tc_flexiport__intf_mPortException,
+ _0RL_flexiport__intf_mPortException_marshal_fn,
+ _0RL_flexiport__intf_mPortException_destructor_fn,
+ (flexiport_intf::PortException*)_sp);
}
-void operator<<=(CORBA::Any& _a, const flexiport_intf::PortException* _sp) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_cflexiport__intf_mPortException(_0RL_tcdesc, *_sp);
- _a.PR_packFrom(_0RL_tc_flexiport__intf_mPortException, &_0RL_tcdesc);
- delete (flexiport_intf::PortException *)_sp;
-}
-
-CORBA::Boolean operator>>=(const CORBA::Any& _a,const flexiport_intf::PortException*& _sp) {
- _sp = (flexiport_intf::PortException *) _a.PR_getCachedData();
- if (_sp == 0) {
- tcDescriptor _0RL_tcdesc;
- _sp = new flexiport_intf::PortException;
- _0RL_buildDesc_cflexiport__intf_mPortException(_0RL_tcdesc, *_sp);
- if (_a.PR_unpackTo(_0RL_tc_flexiport__intf_mPortException, &_0RL_tcdesc)) {
- ((CORBA::Any *)&_a)->PR_setCachedData((void*)_sp, _0RL_delete_flexiport__intf_mPortException);
- return 1;
- } else {
- delete (flexiport_intf::PortException *)_sp;_sp = 0;
- return 0;
- }
- } else {
- CORBA::TypeCode_var _0RL_tctmp = _a.type();
- if (_0RL_tctmp->equivalent(_0RL_tc_flexiport__intf_mPortException)) return 1;
- delete (flexiport_intf::PortException *)_sp;_sp = 0;
- return 0;
+::CORBA::Boolean operator>>=(const ::CORBA::Any& _a, const flexiport_intf::PortException*& _sp)
+{
+ void* _v;
+ if (_a.PR_extract(_0RL_tc_flexiport__intf_mPortException,
+ _0RL_flexiport__intf_mPortException_unmarshal_fn,
+ _0RL_flexiport__intf_mPortException_marshal_fn,
+ _0RL_flexiport__intf_mPortException_destructor_fn,
+ _v)) {
+ _sp = (const flexiport_intf::PortException*)_v;
+ return 1;
}
+ return 0;
}
-static void _0RL_insertToAny__cflexiport__intf_mPortException(CORBA::Any& _a,const CORBA::Exception& _e) {
+static void _0RL_insertToAny__cflexiport__intf_mPortException(::CORBA::Any& _a, const ::CORBA::Exception& _e) {
const flexiport_intf::PortException & _ex = (const flexiport_intf::PortException &) _e;
operator<<=(_a,_ex);
}
-static void _0RL_insertToAnyNCP__cflexiport__intf_mPortException (CORBA::Any& _a,const CORBA::Exception* _e) {
- const flexiport_intf::PortException * _ex = (const flexiport_intf::PortException *) _e;
+static void _0RL_insertToAnyNCP__cflexiport__intf_mPortException (::CORBA::Any& _a, const ::CORBA::Exception* _e) {
+ const flexiport_intf::PortException* _ex = (const flexiport_intf::PortException*) _e;
operator<<=(_a,_ex);
}
@@ -100,71 +85,55 @@
};
static _0RL_insertToAny_Singleton__cflexiport__intf_mPortException _0RL_insertToAny_Singleton__cflexiport__intf_mPortException_;
-static void
-_0RL_tcParser_setObjectPtr_flexiport__intf(const tcObjrefDesc *_desc, CORBA::Object_ptr _ptr)
+static void _0RL_flexiport__intf_marshal_fn(cdrStream& _s, void* _v)
{
- flexiport_intf_ptr _p = flexiport_intf::_narrow(_ptr);
- flexiport_intf_ptr* pp = (flexiport_intf_ptr*)_desc->opq_objref;
- if (_desc->opq_release && !CORBA::is_nil(*pp)) CORBA::release(*pp);
- *pp = _p;
- CORBA::release(_ptr);
+ omniObjRef* _o = (omniObjRef*)_v;
+ omniObjRef::_marshal(_o, _s);
}
-
-static CORBA::Object_ptr
-_0RL_tcParser_getObjectPtr_flexiport__intf(const tcObjrefDesc *_desc)
+static void _0RL_flexiport__intf_unmarshal_fn(cdrStream& _s, void*& _v)
{
- return (CORBA::Object_ptr) *((flexiport_intf_ptr*)_desc->opq_objref);
+ omniObjRef* _o = omniObjRef::_unMarshal(flexiport_intf::_PD_repoId, _s);
+ _v = _o;
}
-
-void _0RL_buildDesc_cflexiport__intf(tcDescriptor& _desc, const _CORBA_ObjRef_tcDesc_arg< _objref_flexiport_intf, flexiport_intf_Helper> & _d)
+static void _0RL_flexiport__intf_destructor_fn(void* _v)
{
- _desc.p_objref.opq_objref = (void*) &_d._data;
- _desc.p_objref.opq_release = _d._rel;
- _desc.p_objref.setObjectPtr = _0RL_tcParser_setObjectPtr_flexiport__intf;
- _desc.p_objref.getObjectPtr = _0RL_tcParser_getObjectPtr_flexiport__intf;
+ omniObjRef* _o = (omniObjRef*)_v;
+ if (_o)
+ omni::releaseObjRef(_o);
}
-void _0RL_delete_flexiport__intf(void* _data) {
- CORBA::release((flexiport_intf_ptr) _data);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr _o)
+{
+ flexiport_intf_ptr _no = flexiport_intf::_duplicate(_o);
+ _a.PR_insert(_tc_flexiport_intf,
+ _0RL_flexiport__intf_marshal_fn,
+ _0RL_flexiport__intf_destructor_fn,
+ _no->_PR_getobj());
}
-
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr _s) {
- tcDescriptor tcd;
- _CORBA_ObjRef_tcDesc_arg< _objref_flexiport_intf, flexiport_intf_Helper> tmp(_s,0);
- _0RL_buildDesc_cflexiport__intf(tcd, tmp);
- _a.PR_packFrom(_tc_flexiport_intf, &tcd);
+void operator<<=(::CORBA::Any& _a, flexiport_intf_ptr* _op)
+{
+ _a.PR_insert(_tc_flexiport_intf,
+ _0RL_flexiport__intf_marshal_fn,
+ _0RL_flexiport__intf_destructor_fn,
+ (*_op)->_PR_getobj());
+ *_op = flexiport_intf::_nil();
}
-void operator<<=(CORBA::Any& _a, flexiport_intf_ptr* _sp) {
- _a <<= *_sp;
- CORBA::release(*_sp);
- *_sp = flexiport_intf::_nil();
-}
-
-CORBA::Boolean operator>>=(const CORBA::Any& _a, flexiport_intf_ptr& _s) {
- flexiport_intf_ptr sp = (flexiport_intf_ptr) _a.PR_getCachedData();
- if (sp == 0) {
- tcDescriptor tcd;
- flexiport_intf_var tmp;
- _0RL_buildDesc_cflexiport__intf(tcd, tmp);
- if( _a.PR_unpackTo(_tc_flexiport_intf, &tcd) ) {
- if (!omniORB::omniORB_27_CompatibleAnyExtraction) {
- ((CORBA::Any*)&_a)->PR_setCachedData((void*)(flexiport_intf_ptr)tmp,_0RL_delete_flexiport__intf);
- }
- _s = tmp._retn();
- return 1;
- } else {
- _s = flexiport_intf::_nil(); return 0;
- }
+::CORBA::Boolean operator>>=(const ::CORBA::Any& _a, flexiport_intf_ptr& _o)
+{
+ void* _v;
+ if (_a.PR_extract(_tc_flexiport_intf,
+ _0RL_flexiport__intf_unmarshal_fn,
+ _0RL_flexiport__intf_marshal_fn,
+ _0RL_flexiport__intf_destructor_fn,
+ _v)) {
+ omniObjRef* _r = (omniObjRef*)_v;
+ if (_r)
+ _o = (flexiport_intf_ptr)_r->_ptrToObjRef(flexiport_intf::_PD_repoId);
+ else
+ _o = flexiport_intf::_nil();
+ return 1;
}
- else {
- CORBA::TypeCode_var tc = _a.type();
- if (tc->equivalent(_tc_flexiport_intf)) {
- _s = sp; return 1;
- }
- else {
- _s = flexiport_intf::_nil(); return 0;
- }
- }
+ return 0;
}
Modified: openrtm/trunk/flexiport/flexiportSK.cc
===================================================================
--- openrtm/trunk/flexiport/flexiportSK.cc 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/flexiport/flexiportSK.cc 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,4 +1,4 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend)- omniORB_4_1. Do not edit.
#include "flexiport.hh"
#include <omniORB4/IOP_S.h>
@@ -10,14 +10,14 @@
OMNI_USING_NAMESPACE(omni)
-static const char* _0RL_library_version = omniORB_4_0;
+static const char* _0RL_library_version = omniORB_4_1;
-CORBA::Exception::insertExceptionToAny flexiport_intf::PortException::insertToAnyFn = 0;
-CORBA::Exception::insertExceptionToAnyNCP flexiport_intf::PortException::insertToAnyFnNCP = 0;
+::CORBA::Exception::insertExceptionToAny flexiport_intf::PortException::insertToAnyFn = 0;
+::CORBA::Exception::insertExceptionToAnyNCP flexiport_intf::PortException::insertToAnyFnNCP = 0;
-flexiport_intf::PortException::PortException(const flexiport_intf::PortException& _s) : CORBA::UserException(_s)
+flexiport_intf::PortException::PortException(const flexiport_intf::PortException& _s) : ::CORBA::UserException(_s)
{
errorStr = _s.errorStr;
@@ -35,7 +35,7 @@
flexiport_intf::PortException& flexiport_intf::PortException::operator=(const flexiport_intf::PortException& _s)
{
- ((CORBA::UserException*) this)->operator=(_s);
+ ((::CORBA::UserException*) this)->operator=(_s);
errorStr = _s.errorStr;
return *this;
@@ -48,15 +48,15 @@
const char* flexiport_intf::PortException::_PD_repoId = "IDL:flexiport_intf/PortException:1.0";
const char* flexiport_intf::PortException::_PD_typeId = "Exception/UserException/flexiport_intf::PortException";
-flexiport_intf::PortException* flexiport_intf::PortException::_downcast(CORBA::Exception* _e) {
+flexiport_intf::PortException* flexiport_intf::PortException::_downcast(::CORBA::Exception* _e) {
return (PortException*) _NP_is_a(_e, _PD_typeId);
}
-const flexiport_intf::PortException* flexiport_intf::PortException::_downcast(const CORBA::Exception* _e) {
+const flexiport_intf::PortException* flexiport_intf::PortException::_downcast(const ::CORBA::Exception* _e) {
return (const PortException*) _NP_is_a(_e, _PD_typeId);
}
-CORBA::Exception* flexiport_intf::PortException::_NP_duplicate() const {
+::CORBA::Exception* flexiport_intf::PortException::_NP_duplicate() const {
return new PortException(*this);
}
@@ -91,19 +91,15 @@
return ::flexiport_intf::_nil();
}
-CORBA::Boolean flexiport_intf_Helper::is_nil(::flexiport_intf_ptr p) {
- return CORBA::is_nil(p);
+::CORBA::Boolean flexiport_intf_Helper::is_nil(::flexiport_intf_ptr p) {
+ return ::CORBA::is_nil(p);
}
void flexiport_intf_Helper::release(::flexiport_intf_ptr p) {
- CORBA::release(p);
+ ::CORBA::release(p);
}
-void flexiport_intf_Helper::duplicate(::flexiport_intf_ptr p) {
- if( p && !p->_NP_is_nil() ) omni::duplicateObjRef(p);
-}
-
void flexiport_intf_Helper::marshalObjRef(::flexiport_intf_ptr obj, cdrStream& s) {
::flexiport_intf::_marshalObjRef(obj, s);
}
@@ -112,17 +108,19 @@
return ::flexiport_intf::_unmarshalObjRef(s);
}
+void flexiport_intf_Helper::duplicate(::flexiport_intf_ptr obj) {
+ if( obj && !obj->_NP_is_nil() ) omni::duplicateObjRef(obj);
+}
+
flexiport_intf_ptr
flexiport_intf::_duplicate(::flexiport_intf_ptr obj)
{
if( obj && !obj->_NP_is_nil() ) omni::duplicateObjRef(obj);
-
return obj;
}
-
flexiport_intf_ptr
-flexiport_intf::_narrow(CORBA::Object_ptr obj)
+flexiport_intf::_narrow(::CORBA::Object_ptr obj)
{
if( !obj || obj->_NP_is_nil() || obj->_NP_is_pseudo() ) return _nil();
_ptr_type e = (_ptr_type) obj->_PR_getobj()->_realNarrow(_PD_repoId);
@@ -131,14 +129,13 @@
flexiport_intf_ptr
-flexiport_intf::_unchecked_narrow(CORBA::Object_ptr obj)
+flexiport_intf::_unchecked_narrow(::CORBA::Object_ptr obj)
{
if( !obj || obj->_NP_is_nil() || obj->_NP_is_pseudo() ) return _nil();
_ptr_type e = (_ptr_type) obj->_PR_getobj()->_uncheckedNarrow(_PD_repoId);
return e ? e : _nil();
}
-
flexiport_intf_ptr
flexiport_intf::_nil()
{
@@ -162,7 +159,9 @@
const char* flexiport_intf::_PD_repoId = "IDL:flexiport_intf:1.0";
-_objref_flexiport_intf::~_objref_flexiport_intf() {}
+_objref_flexiport_intf::~_objref_flexiport_intf() {
+
+}
_objref_flexiport_intf::_objref_flexiport_intf(omniIOR* ior, omniIdentity* id) :
@@ -198,7 +197,10 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_00000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall)
+ {
+
+ }
@@ -225,13 +227,13 @@
else {
if (iop_client) iop_client->RequestCompleted(1);
OMNIORB_THROW(UNKNOWN,UNKNOWN_UserException,
- (CORBA::CompletionStatus)s.completion());
+ (::CORBA::CompletionStatus)s.completion());
}
}
// Local call call-back function.
static void
-_0RL_lcfn_7a0ad30412f405bc_10000000(omniCallDescriptor*, omniServant* svnt)
+_0RL_lcfn_7a0ad30412f405bc_10000000(omniCallDescriptor* cd, omniServant* svnt)
{
_impl_flexiport_intf* impl = (_impl_flexiport_intf*) svnt->_ptrToInterface(flexiport_intf::_PD_repoId);
@@ -267,7 +269,7 @@
}
// Local call call-back function.
static void
-_0RL_lcfn_7a0ad30412f405bc_20000000(omniCallDescriptor*, omniServant* svnt)
+_0RL_lcfn_7a0ad30412f405bc_20000000(omniCallDescriptor* cd, omniServant* svnt)
{
_impl_flexiport_intf* impl = (_impl_flexiport_intf*) svnt->_ptrToInterface(flexiport_intf::_PD_repoId);
@@ -308,7 +310,10 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_30000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
@@ -317,7 +322,7 @@
void userException(cdrStream&,_OMNI_NS(IOP_C)*,const char*);
static const char* const _user_exns[];
- CORBA::String_var result;
+ ::CORBA::String_var result;
};
void _0RL_cd_7a0ad30412f405bc_30000000::marshalReturnedValues(cdrStream& _n)
@@ -349,7 +354,7 @@
else {
if (iop_client) iop_client->RequestCompleted(1);
OMNIORB_THROW(UNKNOWN,UNKNOWN_UserException,
- (CORBA::CompletionStatus)s.completion());
+ (::CORBA::CompletionStatus)s.completion());
}
}
@@ -396,14 +401,19 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_50000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, 0, 0, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 0, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
void marshalReturnedValues(cdrStream&);
- CORBA::String_var result;
+ static const char* const _user_exns[];
+
+ ::CORBA::String_var result;
};
void _0RL_cd_7a0ad30412f405bc_50000000::marshalReturnedValues(cdrStream& _n)
@@ -418,6 +428,10 @@
}
+const char* const _0RL_cd_7a0ad30412f405bc_50000000::_user_exns[] = {
+ 0
+};
+
// Local call call-back function.
static void
_0RL_lcfn_7a0ad30412f405bc_60000000(omniCallDescriptor* cd, omniServant* svnt)
@@ -446,14 +460,19 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_70000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, 0, 0, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 0, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
void marshalReturnedValues(cdrStream&);
- CORBA::Boolean result;
+ static const char* const _user_exns[];
+
+ ::CORBA::Boolean result;
};
void _0RL_cd_7a0ad30412f405bc_70000000::marshalReturnedValues(cdrStream& _n)
@@ -468,6 +487,10 @@
}
+const char* const _0RL_cd_7a0ad30412f405bc_70000000::_user_exns[] = {
+ 0
+};
+
// Local call call-back function.
static void
_0RL_lcfn_7a0ad30412f405bc_80000000(omniCallDescriptor* cd, omniServant* svnt)
@@ -479,7 +502,7 @@
}
-CORBA::Boolean _objref_flexiport_intf::IsBlocking()
+::CORBA::Boolean _objref_flexiport_intf::IsBlocking()
{
_0RL_cd_7a0ad30412f405bc_70000000 _call_desc(_0RL_lcfn_7a0ad30412f405bc_80000000, "IsBlocking", 11);
@@ -496,7 +519,10 @@
{
public:
inline _0RL_cd_7a0ad30412f405bc_90000000(LocalCallFn lcfn,const char* op_,size_t oplen,_CORBA_Boolean upcall=0):
- omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall) {}
+ omniCallDescriptor(lcfn, op_, oplen, 0, _user_exns, 1, upcall)
+ {
+
+ }
void unmarshalReturnedValues(cdrStream&);
@@ -505,7 +531,7 @@
void userException(cdrStream&,_OMNI_NS(IOP_C)*,const char*);
static const char* const _user_exns[];
- CORBA::Boolean result;
+ ::CORBA::Boolean result;
};
void _0RL_cd_7a0ad30412f405bc_90000000::marshalReturnedValues(cdrStream& _n)
@@ -537,7 +563,7 @@
else {
if (iop_client) iop_client->RequestCompleted(1);
OMNIORB_THROW(UNKNOWN,UNKNOWN_UserException,
- (CORBA::CompletionStatus)s.completion());
+ (::CORBA::CompletionStatus)s.completion());
}
}
@@ -567,7 +593,7 @@
}
-CORBA::Boolean _objref_flexiport_intf::IsOpen()
+::CORBA::Boolean _objref_flexiport_intf::IsOpen()
{
_0RL_cd_7a0ad30412f405bc_90000000 _call_desc(_0RL_lcfn_7a0ad30412f405bc_a0000000, "IsOpen", 7);
@@ -587,7 +613,7 @@
}
-CORBA::Boolean
+::CORBA::Boolean
_pof_flexiport_intf::is_a(const char* id) const
{
if( omni::ptrStrMatch(id, ::flexiport_intf::_PD_repoId) )
@@ -601,7 +627,7 @@
_impl_flexiport_intf::~_impl_flexiport_intf() {}
-CORBA::Boolean
+::CORBA::Boolean
_impl_flexiport_intf::_dispatch(omniCallHandle& _handle)
{
const char* op = _handle.operation_name();
Modified: openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp
===================================================================
--- openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/gbxnovatelacfr/GbxNovatelAcfr.cpp 2010-01-07 06:26:50 UTC (rev 479)
@@ -38,21 +38,21 @@
return 10;
case gbxnovatelacfr::NegativeVar:
return 11;
+ case gbxnovatelacfr::ReservedGpsSolutionStatusType12:
+ return 12;
case gbxnovatelacfr::IntegrityWarning:
- return 12;
+ return 13;
case gbxnovatelacfr::InsInactive:
- return 13;
+ return 14;
case gbxnovatelacfr::InsAligning:
- return 14;
+ return 15;
case gbxnovatelacfr::InsBad:
- return 15;
+ return 16;
case gbxnovatelacfr::ImuUnplugged:
- return 16;
+ return 17;
case gbxnovatelacfr::Pending:
- return 17;
+ return 18;
case gbxnovatelacfr::InvalidFix:
- return 18;
- case gbxnovatelacfr::ReservedGpsSolutionStatusType:
return 19;
case gbxnovatelacfr::UnknownGpsSolutionStatusType:
return 20;
@@ -70,58 +70,96 @@
return 1;
case gbxnovatelacfr::FixedHeight:
return 2;
+ case gbxnovatelacfr::ReservedGpsPosVelType3:
+ return 3;
case gbxnovatelacfr::FloatConv:
- return 3;
+ return 4;
case gbxnovatelacfr::WideLane:
- return 4;
+ return 5;
case gbxnovatelacfr::NarrowLane:
- return 5;
- case gbxnovatelacfr::DopplerVelocity:
return 6;
- case gbxnovatelacfr::Single:
+ case gbxnovatelacfr::ReservedGpsPosVelType7:
return 7;
- case gbxnovatelacfr::PsrDiff:
+ case gbxnovatelacfr::DopplerVelocity:
return 8;
- case gbxnovatelacfr::Waas:
+ case gbxnovatelacfr::ReservedGpsPosVelType9:
return 9;
- case gbxnovatelacfr::Propagated:
+ case gbxnovatelacfr::ReservedGpsPosVelType10:
+ return 10;
+ case gbxnovatelacfr::ReservedGpsPosVelType11:
return 11;
- case gbxnovatelacfr::Omnistar:
+ case gbxnovatelacfr::ReservedGpsPosVelType12:
return 12;
- case gbxnovatelacfr::L1Float:
+ case gbxnovatelacfr::ReservedGpsPosVelType13:
return 13;
- case gbxnovatelacfr::IonoFreeFloat:
+ case gbxnovatelacfr::ReservedGpsPosVelType14:
return 14;
- case gbxnovatelacfr::NarrowFloat:
+ case gbxnovatelacfr::ReservedGpsPosVelType15:
return 15;
- case gbxnovatelacfr::L1Int:
+ case gbxnovatelacfr::Single:
return 16;
- case gbxnovatelacfr::WideInt:
+ case gbxnovatelacfr::PsrDiff:
return 17;
- case gbxnovatelacfr::NarrowInt:
+ case gbxnovatelacfr::Waas:
return 18;
- case gbxnovatelacfr::RtkDirectIns:
+ case gbxnovatelacfr::Propagated:
return 19;
- case gbxnovatelacfr::Ins:
+ case gbxnovatelacfr::Omnistar:
return 20;
- case gbxnovatelacfr::InsPsrSp:
+ case gbxnovatelacfr::ReservedGpsPosVelType21:
return 21;
- case gbxnovatelacfr::InsPsrDiff:
+ case gbxnovatelacfr::ReservedGpsPosVelType22:
return 22;
- case gbxnovatelacfr::InsRtkFloat:
+ case gbxnovatelacfr::ReservedGpsPosVelType23:
return 23;
- case gbxnovatelacfr::InsRtkFixed:
+ case gbxnovatelacfr::ReservedGpsPosVelType24:
return 24;
- case gbxnovatelacfr::OmniStarHp:
+ case gbxnovatelacfr::ReservedGpsPosVelType25:
return 25;
- case gbxnovatelacfr::OmniStarXp:
+ case gbxnovatelacfr::ReservedGpsPosVelType26:
return 26;
- case gbxnovatelacfr::CdGps:
+ case gbxnovatelacfr::ReservedGpsPosVelType27:
return 27;
- case gbxnovatelacfr::ReservedGpsPosVelType:
+ case gbxnovatelacfr::ReservedGpsPosVelType28:
return 28;
+ case gbxnovatelacfr::ReservedGpsPosVelType29:
+ return 29;
+ case gbxnovatelacfr::ReservedGpsPosVelType30:
+ return 30;
+ case gbxnovatelacfr::ReservedGpsPosVelType31:
+ return 31;
+ case gbxnovatelacfr::L1Float:
+ return 32;
+ case gbxnovatelacfr::IonoFreeFloat:
+ return 33;
+ case gbxnovatelacfr::NarrowFloat:
+ return 34;
+ case gbxnovatelacfr::L1Int:
+ return 48;
+ case gbxnovatelacfr::WideInt:
+ return 49;
+ case gbxnovatelacfr::NarrowInt:
+ return 50;
+ case gbxnovatelacfr::RtkDirectIns:
+ return 51;
+ case gbxnovatelacfr::Ins:
+ return 52;
+ case gbxnovatelacfr::InsPsrSp:
+ return 53;
+ case gbxnovatelacfr::InsPsrDiff:
+ return 54;
+ case gbxnovatelacfr::InsRtkFloat:
+ return 55;
+ case gbxnovatelacfr::InsRtkFixed:
+ return 56;
+ case gbxnovatelacfr::OmniStarHp:
+ return 64;
+ case gbxnovatelacfr::OmniStarXp:
+ return 65;
+ case gbxnovatelacfr::CdGps:
+ return 66;
case gbxnovatelacfr::UnknownGpsPosVelType:
- return 29;
+ return 67;
}
return -1;
}
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aist.cpp 2010-01-07 06:26:50 UTC (rev 479)
@@ -9,8 +9,6 @@
#include "hokuyo_aist.h"
-#include <ace/Guard_T.h>
-
// Module specification
// <rtc-template block="module_spec">
static const char* hokuyo_aist_spec[] =
@@ -136,7 +134,7 @@
RTC::ReturnCode_t Hokuyo_AIST::onActivated(RTC::UniqueId ec_id)
{
- ACE_Guard<ACE_Mutex> guard (m_mutex);
+ coil::Guard<coil::Mutex> guard (m_mutex);
try
{
m_laser.Open (m_portOptions);
@@ -190,7 +188,7 @@
RTC::ReturnCode_t Hokuyo_AIST::onDeactivated(RTC::UniqueId ec_id)
{
- ACE_Guard<ACE_Mutex> guard (m_mutex);
+ coil::Guard<coil::Mutex> guard (m_mutex);
try
{
m_laser.SetPower (false);
@@ -209,8 +207,7 @@
RTC::ReturnCode_t Hokuyo_AIST::onExecute(RTC::UniqueId ec_id)
{
- std::cerr << "onExecute start" << std::endl;
- ACE_Guard<ACE_Mutex> guard (m_mutex);
+ coil::Guard<coil::Mutex> guard (m_mutex);
try
{
if (m_power != m_oldPower)
@@ -282,7 +279,6 @@
std::cerr << "Error in onExecute: (" << e.Code () << ") " << e.what () << std::endl;
return RTC::RTC_ERROR;
}
- std::cerr << "onExecute done" << std::endl;
return RTC::RTC_OK;
}
@@ -356,8 +352,8 @@
if (m_laserData.Intensities () != NULL)
{
m_intensities.data.length (m_laserData.Length () + 2);
- m_intensities.data[0] = m_angResolution;
- m_intensities.data[1] = actualStartAngle;
+ m_intensities.data[0] = static_cast<int>(m_angResolution);
+ m_intensities.data[1] = static_cast<int>(actualStartAngle);
for (unsigned int ii = 0; ii < m_laserData.Length (); ii++)
m_intensities.data[ii + 2] = m_laserData.Intensities ()[ii];
m_intensitiesOut.write ();
@@ -403,55 +399,55 @@
void Hokuyo_AIST::SetPower (bool enable)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetPower (enable);
}
void Hokuyo_AIST::SetBaudRate (unsigned long baudRate)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetBaud (baudRate);
}
void Hokuyo_AIST::ResetLaser ()
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.Reset ();
}
void Hokuyo_AIST::SetMotorSpeed (unsigned long speed)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetMotorSpeed (speed);
}
void Hokuyo_AIST::SetHighSensitivity (bool enable)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.SetHighSensitivity (enable);
}
void Hokuyo_AIST::GetSensorInfo (hokuyo_aist::HokuyoSensorInfo *dest)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_laser.GetSensorInfo (dest);
}
unsigned long Hokuyo_AIST::GetLaserTime ()
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
return m_laser.GetTime ();
}
void Hokuyo_AIST::SetPullMode (bool mode)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_pullMode = mode;
}
void Hokuyo_AIST::EnableIntensityData (bool mode)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_getIntensities = mode;
}
@@ -462,7 +458,7 @@
void Hokuyo_AIST::SetStartAngle (double angle)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_startAngle = angle;
}
@@ -473,7 +469,7 @@
void Hokuyo_AIST::SetEndAngle (double angle)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_endAngle = angle;
}
@@ -484,7 +480,7 @@
void Hokuyo_AIST::SetStartStep (long step)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_startStep = step;
}
@@ -495,24 +491,24 @@
void Hokuyo_AIST::SetEndStep (long step)
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
m_endStep = step;
}
void Hokuyo_AIST::RequestScan ()
{
- ACE_Guard<ACE_Mutex> guard(m_mutex);
+ coil::Guard<coil::Mutex> guard(m_mutex);
getAndSendScan ();
}
void Hokuyo_AIST::GetLock ()
{
- m_mutex.acquire ();
+ m_mutex.lock ();
}
void Hokuyo_AIST::ReleaseLock ()
{
- m_mutex.release ();
+ m_mutex.unlock ();
}
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aist.h
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aist.h 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aist.h 2010-01-07 06:26:50 UTC (rev 479)
@@ -30,7 +30,7 @@
#include "hokuyo_aist/hokuyo_aist.h"
#include <string>
-#include <ace/Mutex.h>
+#include <coil/Guard.h>
using namespace RTC;
@@ -416,7 +416,7 @@
bool m_oldGetIntensities;
bool m_oldGetNewData;
- ACE_Mutex m_mutex;
+ coil::Mutex m_mutex;
void GetLock ();
void ReleaseLock ();
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aist.hh
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aist.hh 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aist.hh 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,15 +1,14 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend)- omniORB_4_1. Do not edit.
#ifndef __hokuyo__aist_hh__
#define __hokuyo__aist_hh__
-#ifndef USE_omniORB_logStream
-#define USE_omniORB_logStream
-#endif
-
#ifndef __CORBA_H_EXTERNAL_GUARD__
#include <omniORB4/CORBA.h>
#endif
+#ifndef USE_stub_in_nt_dll
+# define USE_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
+#endif
#ifndef USE_core_stub_in_nt_dll
# define USE_core_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
#endif
@@ -23,13 +22,13 @@
#ifdef USE_stub_in_nt_dll
-#ifndef USE_core_stub_in_nt_dll
-#define USE_core_stub_in_nt_dll
+# ifndef USE_core_stub_in_nt_dll
+# define USE_core_stub_in_nt_dll
+# endif
+# ifndef USE_dyn_stub_in_nt_dll
+# define USE_dyn_stub_in_nt_dll
+# endif
#endif
-#ifndef USE_dyn_stub_in_nt_dll
-#define USE_dyn_stub_in_nt_dll
-#endif
-#endif
#ifdef _core_attr
# error "A local CPP macro _core_attr has already been defined."
@@ -82,6 +81,7 @@
#endif
+// interface hokuyo_aist_control
class hokuyo_aist_control {
public:
// Declarations for this interface type.
@@ -89,8 +89,9 @@
typedef hokuyo_aist_control_var _var_type;
static _ptr_type _duplicate(_ptr_type);
- static _ptr_type _narrow(CORBA::Object_ptr);
- static _ptr_type _unchecked_narrow(CORBA::Object_ptr);
+ static _ptr_type _narrow(::CORBA::Object_ptr);
+ static _ptr_type _unchecked_narrow(::CORBA::Object_ptr);
+
static _ptr_type _nil();
static inline void _marshalObjRef(_ptr_type, cdrStream&);
@@ -106,12 +107,12 @@
static _core_attr const char* _PD_repoId;
// Other IDL defined within this scope.
- class HokuyoError : public CORBA::UserException {
+ class HokuyoError : public ::CORBA::UserException {
public:
- CORBA::Short errorCode;
+ ::CORBA::Short errorCode;
- CORBA::String_member errorStr;
+ ::CORBA::String_member errorStr;
@@ -120,13 +121,13 @@
pd_insertToAnyFnNCP = insertToAnyFnNCP;
}
HokuyoError(const HokuyoError&);
- HokuyoError(CORBA::Short i_errorCode, const char* i_errorStr);
+ HokuyoError(::CORBA::Short i_errorCode, const char* i_errorStr);
HokuyoError& operator=(const HokuyoError&);
virtual ~HokuyoError();
virtual void _raise() const;
- static HokuyoError* _downcast(CORBA::Exception*);
- static const HokuyoError* _downcast(const CORBA::Exception*);
- static inline HokuyoError* _narrow(CORBA::Exception* _e) {
+ static HokuyoError* _downcast(::CORBA::Exception*);
+ static const HokuyoError* _downcast(const ::CORBA::Exception*);
+ static inline HokuyoError* _narrow(::CORBA::Exception* _e) {
return _downcast(_e);
}
@@ -136,7 +137,7 @@
static _core_attr insertExceptionToAny insertToAnyFn;
static _core_attr insertExceptionToAnyNCP insertToAnyFnNCP;
- virtual CORBA::Exception* _NP_duplicate() const;
+ virtual ::CORBA::Exception* _NP_duplicate() const;
static _core_attr const char* _PD_repoId;
static _core_attr const char* _PD_typeId;
@@ -147,59 +148,59 @@
virtual void _NP_marshal(cdrStream&) const;
};
- static _dyn_attr const CORBA::TypeCode_ptr _tc_HokuyoError;
+ static _dyn_attr const ::CORBA::TypeCode_ptr _tc_HokuyoError;
struct HokuyoSensorInfo {
typedef _CORBA_ConstrType_Variable_Var<HokuyoSensorInfo> _var_type;
- CORBA::String_member vendor;
+ ::CORBA::String_member vendor;
- CORBA::String_member product;
+ ::CORBA::String_member product;
- CORBA::String_member firmware;
+ ::CORBA::String_member firmware;
- CORBA::String_member protocol;
+ ::CORBA::String_member protocol;
- CORBA::String_member serial;
+ ::CORBA::String_member serial;
- CORBA::String_member model;
+ ::CORBA::String_member model;
- CORBA::Long minRange;
+ ::CORBA::Long minRange;
- CORBA::Long maxRange;
+ ::CORBA::Long maxRange;
- CORBA::Long steps;
+ ::CORBA::Long steps;
- CORBA::Long firstStep;
+ ::CORBA::Long firstStep;
- CORBA::Long lastStep;
+ ::CORBA::Long lastStep;
- CORBA::Long frontStep;
+ ::CORBA::Long frontStep;
- CORBA::Long standardSpeed;
+ ::CORBA::Long standardSpeed;
- CORBA::Boolean power;
+ ::CORBA::Boolean power;
- CORBA::Long speed;
+ ::CORBA::Long speed;
- CORBA::Short speedLevel;
+ ::CORBA::Short speedLevel;
- CORBA::String_member measureState;
+ ::CORBA::String_member measureState;
- CORBA::Long baud;
+ ::CORBA::Long baud;
- CORBA::Long time;
+ ::CORBA::Long time;
- CORBA::String_member diagnostic;
+ ::CORBA::String_member diagnostic;
- CORBA::Double minAngle;
+ ::CORBA::Double minAngle;
- CORBA::Double maxAngle;
+ ::CORBA::Double maxAngle;
- CORBA::Double resolution;
+ ::CORBA::Double resolution;
- CORBA::Long scanableSteps;
+ ::CORBA::Long scanableSteps;
@@ -211,35 +212,36 @@
typedef _CORBA_ConstrType_Variable_OUT_arg< HokuyoSensorInfo,HokuyoSensorInfo_var > HokuyoSensorInfo_out;
- static _dyn_attr const CORBA::TypeCode_ptr _tc_HokuyoSensorInfo;
+ static _dyn_attr const ::CORBA::TypeCode_ptr _tc_HokuyoSensorInfo;
};
class _objref_hokuyo_aist_control :
- public virtual CORBA::Object, public virtual omniObjRef
+ public virtual ::CORBA::Object,
+ public virtual omniObjRef
{
public:
- CORBA::Boolean GetPower();
- void SetPower(CORBA::Boolean power);
- CORBA::ULong GetBaudRate();
- void SetBaudRate(CORBA::ULong baudRate);
+ ::CORBA::Boolean GetPower();
+ void SetPower(::CORBA::Boolean power);
+ ::CORBA::ULong GetBaudRate();
+ void SetBaudRate(::CORBA::ULong baudRate);
void Reset();
- CORBA::ULong GetSpeed();
- void SetSpeed(CORBA::ULong speed);
- void SetHighSensitivity(CORBA::Boolean sensitivity);
+ ::CORBA::ULong GetSpeed();
+ void SetSpeed(::CORBA::ULong speed);
+ void SetHighSensitivity(::CORBA::Boolean sensitivity);
hokuyo_aist_control::HokuyoSensorInfo* GetSensorInfo();
- CORBA::ULong GetTime();
- void SetPullMode(CORBA::Boolean mode);
- void EnableIntensityData(CORBA::Boolean enable);
- CORBA::Double GetStartAngle();
- void SetStartAngle(CORBA::Double angle);
- CORBA::Double GetEndAngle();
- void SetEndAngle(CORBA::Double angle);
- CORBA::Long GetStartStep();
- void SetStartStep(CORBA::Long step);
- CORBA::Long GetEndStep();
- void SetEndStep(CORBA::Long step);
+ ::CORBA::ULong GetTime();
+ void SetPullMode(::CORBA::Boolean mode);
+ void EnableIntensityData(::CORBA::Boolean enable);
+ ::CORBA::Double GetStartAngle();
+ void SetStartAngle(::CORBA::Double angle);
+ ::CORBA::Double GetEndAngle();
+ void SetEndAngle(::CORBA::Double angle);
+ ::CORBA::Long GetStartStep();
+ void SetStartStep(::CORBA::Long step);
+ ::CORBA::Long GetEndStep();
+ void SetEndStep(::CORBA::Long step);
void RequestScan();
inline _objref_hokuyo_aist_control() { _PR_setobj(0); } // nil
@@ -274,26 +276,26 @@
public:
virtual ~_impl_hokuyo_aist_control();
- virtual CORBA::Boolean GetPower() = 0;
- virtual void SetPower(CORBA::Boolean power) = 0;
- virtual CORBA::ULong GetBaudRate() = 0;
- virtual void SetBaudRate(CORBA::ULong baudRate) = 0;
+ virtual ::CORBA::Boolean GetPower() = 0;
+ virtual void SetPower(::CORBA::Boolean power) = 0;
+ virtual ::CORBA::ULong GetBaudRate() = 0;
+ virtual void SetBaudRate(::CORBA::ULong baudRate) = 0;
virtual void Reset() = 0;
- virtual CORBA::ULong GetSpeed() = 0;
- virtual void SetSpeed(CORBA::ULong speed) = 0;
- virtual void SetHighSensitivity(CORBA::Boolean sensitivity) = 0;
+ virtual ::CORBA::ULong GetSpeed() = 0;
+ virtual void SetSpeed(::CORBA::ULong speed) = 0;
+ virtual void SetHighSensitivity(::CORBA::Boolean sensitivity) = 0;
virtual hokuyo_aist_control::HokuyoSensorInfo* GetSensorInfo() = 0;
- virtual CORBA::ULong GetTime() = 0;
- virtual void SetPullMode(CORBA::Boolean mode) = 0;
- virtual void EnableIntensityData(CORBA::Boolean enable) = 0;
- virtual CORBA::Double GetStartAngle() = 0;
- virtual void SetStartAngle(CORBA::Double angle) = 0;
- virtual CORBA::Double GetEndAngle() = 0;
- virtual void SetEndAngle(CORBA::Double angle) = 0;
- virtual CORBA::Long GetStartStep() = 0;
- virtual void SetStartStep(CORBA::Long step) = 0;
- virtual CORBA::Long GetEndStep() = 0;
- virtual void SetEndStep(CORBA::Long step) = 0;
+ virtual ::CORBA::ULong GetTime() = 0;
+ virtual void SetPullMode(::CORBA::Boolean mode) = 0;
+ virtual void EnableIntensityData(::CORBA::Boolean enable) = 0;
+ virtual ::CORBA::Double GetStartAngle() = 0;
+ virtual void SetStartAngle(::CORBA::Double angle) = 0;
+ virtual ::CORBA::Double GetEndAngle() = 0;
+ virtual void SetEndAngle(::CORBA::Double angle) = 0;
+ virtual ::CORBA::Long GetStartStep() = 0;
+ virtual void SetStartStep(::CORBA::Long step) = 0;
+ virtual ::CORBA::Long GetEndStep() = 0;
+ virtual void SetEndStep(::CORBA::Long step) = 0;
virtual void RequestScan() = 0;
public: // Really protected, workaround for xlC
@@ -302,16 +304,17 @@
private:
virtual void* _ptrToInterface(const char*);
virtual const char* _mostDerivedRepoId();
+
};
-_CORBA_GLOBAL_VAR _dyn_attr const CORBA::TypeCode_ptr _tc_hokuyo_aist_control;
+_CORBA_GLOBAL_VAR _dyn_attr const ::CORBA::TypeCode_ptr _tc_hokuyo_aist_control;
class POA_hokuyo_aist_control :
public virtual _impl_hokuyo_aist_control,
- public virtual PortableServer::ServantBase
+ public virtual ::PortableServer::ServantBase
{
public:
virtual ~POA_hokuyo_aist_control();
@@ -325,21 +328,23 @@
+
+
#undef _core_attr
#undef _dyn_attr
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s);
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, const hokuyo_aist_control::HokuyoError*& _sp);
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s);
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError*& _sp);
-extern void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo& _s);
-extern void operator<<=(CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo* _sp);
-extern CORBA::Boolean operator>>=(const CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo*& _sp);
-extern CORBA::Boolean operator>>=(const CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo*& _sp);
+extern void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo& _s);
+extern void operator<<=(::CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo* _sp);
+extern _CORBA_Boolean operator>>=(const ::CORBA::Any& _a, hokuyo_aist_control::HokuyoSensorInfo*& _sp);
+extern _CORBA_Boolean operator>>=(const ::CORBA::Any& _a, const hokuyo_aist_control::HokuyoSensorInfo*& _sp);
-void operator<<=(CORBA::Any& _a, hokuyo_aist_control_ptr _s);
-void operator<<=(CORBA::Any& _a, hokuyo_aist_control_ptr* _s);
-CORBA::Boolean operator>>=(const CORBA::Any& _a, hokuyo_aist_control_ptr& _s);
+void operator<<=(::CORBA::Any& _a, hokuyo_aist_control_ptr _s);
+void operator<<=(::CORBA::Any& _a, hokuyo_aist_control_ptr* _s);
+_CORBA_Boolean operator>>=(const ::CORBA::Any& _a, hokuyo_aist_control_ptr& _s);
@@ -351,6 +356,10 @@
+#ifdef USE_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
+# undef USE_stub_in_nt_dll
+# undef USE_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
+#endif
#ifdef USE_core_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
# undef USE_core_stub_in_nt_dll
# undef USE_core_stub_in_nt_dll_NOT_DEFINED_hokuyo__aist
Modified: openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc
===================================================================
--- openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc 2009-12-15 02:03:56 UTC (rev 478)
+++ openrtm/trunk/hokuyo_aist/hokuyo_aistDynSK.cc 2010-01-07 06:26:50 UTC (rev 479)
@@ -1,28 +1,29 @@
-// This file is generated by omniidl (C++ backend)- omniORB_4_0. Do not edit.
+// This file is generated by omniidl (C++ backend) - omniORB_4_1. Do not edit.
#include "hokuyo_aist.hh"
-#include <omniORB4/tcDescriptor.h>
OMNI_USING_NAMESPACE(omni)
-static const char* _0RL_dyn_library_version = omniORB_4_0;
+static const char* _0RL_dyn_library_version = omniORB_4_1_dyn;
+static ::CORBA::TypeCode::_Tracker _0RL_tcTrack(__FILE__);
+
static CORBA::PR_structMember _0RL_structmember_hokuyo__aist__control_mHokuyoError[] = {
{"errorCode", CORBA::TypeCode::PR_short_tc()},
- {"errorStr", CORBA::TypeCode::PR_string_tc(0)}
+ {"errorStr", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)}
};
-static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoError = CORBA::TypeCode::PR_exception_tc("IDL:hokuyo_aist_control/HokuyoError:1.0", "HokuyoError", _0RL_structmember_hokuyo__aist__control_mHokuyoError, 2);
+static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoError = CORBA::TypeCode::PR_exception_tc("IDL:hokuyo_aist_control/HokuyoError:1.0", "HokuyoError", _0RL_structmember_hokuyo__aist__control_mHokuyoError, 2, &_0RL_tcTrack);
const CORBA::TypeCode_ptr hokuyo_aist_control::_tc_HokuyoError = _0RL_tc_hokuyo__aist__control_mHokuyoError;
static CORBA::PR_structMember _0RL_structmember_hokuyo__aist__control_mHokuyoSensorInfo[] = {
- {"vendor", CORBA::TypeCode::PR_string_tc(0)},
- {"product", CORBA::TypeCode::PR_string_tc(0)},
- {"firmware", CORBA::TypeCode::PR_string_tc(0)},
- {"protocol", CORBA::TypeCode::PR_string_tc(0)},
- {"serial", CORBA::TypeCode::PR_string_tc(0)},
- {"model", CORBA::TypeCode::PR_string_tc(0)},
+ {"vendor", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"product", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"firmware", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"protocol", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"serial", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
+ {"model", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
{"minRange", CORBA::TypeCode::PR_long_tc()},
{"maxRange", CORBA::TypeCode::PR_long_tc()},
{"steps", CORBA::TypeCode::PR_long_tc()},
@@ -33,96 +34,81 @@
{"power", CORBA::TypeCode::PR_boolean_tc()},
{"speed", CORBA::TypeCode::PR_long_tc()},
{"speedLevel", CORBA::TypeCode::PR_short_tc()},
- {"measureState", CORBA::TypeCode::PR_string_tc(0)},
+ {"measureState", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
{"baud", CORBA::TypeCode::PR_long_tc()},
{"time", CORBA::TypeCode::PR_long_tc()},
- {"diagnostic", CORBA::TypeCode::PR_string_tc(0)},
+ {"diagnostic", CORBA::TypeCode::PR_string_tc(0, &_0RL_tcTrack)},
{"minAngle", CORBA::TypeCode::PR_double_tc()},
{"maxAngle", CORBA::TypeCode::PR_double_tc()},
{"resolution", CORBA::TypeCode::PR_double_tc()},
{"scanableSteps", CORBA::TypeCode::PR_long_tc()}
};
-static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo = CORBA::TypeCode::PR_struct_tc("IDL:hokuyo_aist_control/HokuyoSensorInfo:1.0", "HokuyoSensorInfo", _0RL_structmember_hokuyo__aist__control_mHokuyoSensorInfo, 24);
+#ifdef _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo
+# undef _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo
+#endif
+static CORBA::TypeCode_ptr _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo = CORBA::TypeCode::PR_struct_tc("IDL:hokuyo_aist_control/HokuyoSensorInfo:1.0", "HokuyoSensorInfo", _0RL_structmember_hokuyo__aist__control_mHokuyoSensorInfo, 24, &_0RL_tcTrack);
+
const CORBA::TypeCode_ptr hokuyo_aist_control::_tc_HokuyoSensorInfo = _0RL_tc_hokuyo__aist__control_mHokuyoSensorInfo;
-const CORBA::TypeCode_ptr _tc_hokuyo_aist_control = CORBA::TypeCode::PR_interface_tc("IDL:hokuyo_aist_control:1.0", "hokuyo_aist_control");
+const CORBA::TypeCode_ptr _tc_hokuyo_aist_control = CORBA::TypeCode::PR_interface_tc("IDL:hokuyo_aist_control:1.0", "hokuyo_aist_control", &_0RL_tcTrack);
- CORBA::Boolean
-_0RL_tcParser_getMemberDesc_hokuyo__aist__control_mHokuyoError(const tcStructDesc *_desc, CORBA::ULong _index, tcDescriptor &_newdesc){
- switch (_index) {
- case 0:
- _0RL_buildDesc_cshort(_newdesc, ((hokuyo_aist_control::HokuyoError*)_desc->opq_struct)->errorCode);
- return 1;
- case 1:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoError*)_desc->opq_struct)->errorStr);
- return 1;
- default:
- return 0;
- };
+static void _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn(cdrStream& _s, void* _v)
+{
+ const hokuyo_aist_control::HokuyoError* _p = (const hokuyo_aist_control::HokuyoError*)_v;
+ *_p >>= _s;
}
- CORBA::ULong
-
-_0RL_tcParser_getMemberCount_hokuyo__aist__control_mHokuyoError(const tcStructDesc *_desc)
+static void _0RL_hokuyo__aist__control_mHokuyoError_unmarshal_fn(cdrStream& _s, void*& _v)
{
- return 2;
+ hokuyo_aist_control::HokuyoError* _p = new hokuyo_aist_control::HokuyoError;
+ *_p <<= _s;
+ _v = _p;
}
-
-void _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(tcDescriptor &_desc, const hokuyo_aist_control::HokuyoError& _data)
+static void _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn(void* _v)
{
- _desc.p_struct.getMemberDesc = _0RL_tcParser_getMemberDesc_hokuyo__aist__control_mHokuyoError;
- _desc.p_struct.getMemberCount = _0RL_tcParser_getMemberCount_hokuyo__aist__control_mHokuyoError;
- _desc.p_struct.opq_struct = (void *)&_data;
+ hokuyo_aist_control::HokuyoError* _p = (hokuyo_aist_control::HokuyoError*)_v;
+ delete _p;
}
-void _0RL_delete_hokuyo__aist__control_mHokuyoError(void* _data) {
- hokuyo_aist_control::HokuyoError* _0RL_t = (hokuyo_aist_control::HokuyoError*) _data;
- delete _0RL_t;
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s)
+{
+ hokuyo_aist_control::HokuyoError* _p = new hokuyo_aist_control::HokuyoError(_s);
+ _a.PR_insert(_0RL_tc_hokuyo__aist__control_mHokuyoError,
+ _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn,
+ _p);
}
-
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError& _s) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(_0RL_tcdesc, _s);
- _a.PR_packFrom(_0RL_tc_hokuyo__aist__control_mHokuyoError, &_0RL_tcdesc);
+void operator<<=(::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp)
+{
+ _a.PR_insert(_0RL_tc_hokuyo__aist__control_mHokuyoError,
+ _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn,
+ (hokuyo_aist_control::HokuyoError*)_sp);
}
-void operator<<=(CORBA::Any& _a, const hokuyo_aist_control::HokuyoError* _sp) {
- tcDescriptor _0RL_tcdesc;
- _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(_0RL_tcdesc, *_sp);
- _a.PR_packFrom(_0RL_tc_hokuyo__aist__control_mHokuyoError, &_0RL_tcdesc);
- delete (hokuyo_aist_control::HokuyoError *)_sp;
-}
-
-CORBA::Boolean operator>>=(const CORBA::Any& _a,const hokuyo_aist_control::HokuyoError*& _sp) {
- _sp = (hokuyo_aist_control::HokuyoError *) _a.PR_getCachedData();
- if (_sp == 0) {
- tcDescriptor _0RL_tcdesc;
- _sp = new hokuyo_aist_control::HokuyoError;
- _0RL_buildDesc_chokuyo__aist__control_mHokuyoError(_0RL_tcdesc, *_sp);
- if (_a.PR_unpackTo(_0RL_tc_hokuyo__aist__control_mHokuyoError, &_0RL_tcdesc)) {
- ((CORBA::Any *)&_a)->PR_setCachedData((void*)_sp, _0RL_delete_hokuyo__aist__control_mHokuyoError);
- return 1;
- } else {
- delete (hokuyo_aist_control::HokuyoError *)_sp;_sp = 0;
- return 0;
- }
- } else {
- CORBA::TypeCode_var _0RL_tctmp = _a.type();
- if (_0RL_tctmp->equivalent(_0RL_tc_hokuyo__aist__control_mHokuyoError)) return 1;
- delete (hokuyo_aist_control::HokuyoError *)_sp;_sp = 0;
- return 0;
+::CORBA::Boolean operator>>=(const ::CORBA::Any& _a, const hokuyo_aist_control::HokuyoError*& _sp)
+{
+ void* _v;
+ if (_a.PR_extract(_0RL_tc_hokuyo__aist__control_mHokuyoError,
+ _0RL_hokuyo__aist__control_mHokuyoError_unmarshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_marshal_fn,
+ _0RL_hokuyo__aist__control_mHokuyoError_destructor_fn,
+ _v)) {
+ _sp = (const hokuyo_aist_control::HokuyoError*)_v;
+ return 1;
}
+ return 0;
}
-static void _0RL_insertToAny__chokuyo__aist__control_mHokuyoError(CORBA::Any& _a,const CORBA::Exception& _e) {
+static void _0RL_insertToAny__chokuyo__aist__control_mHokuyoError(::CORBA::Any& _a, const ::CORBA::Exception& _e) {
const hokuyo_aist_control::HokuyoError & _ex = (const hokuyo_aist_control::HokuyoError &) _e;
operator<<=(_a,_ex);
}
-static void _0RL_insertToAnyNCP__chokuyo__aist__control_mHokuyoError (CORBA::Any& _a,const CORBA::Exception* _e) {
- const hokuyo_aist_control::HokuyoError * _ex = (const hokuyo_aist_control::HokuyoError *) _e;
+static void _0RL_insertToAnyNCP__chokuyo__aist__control_mHokuyoError (::CORBA::Any& _a, const ::CORBA::Exception* _e) {
+ const hokuyo_aist_control::HokuyoError* _ex = (const hokuyo_aist_control::HokuyoError*) _e;
operator<<=(_a,_ex);
}
@@ -135,209 +121,106 @@
};
static _0RL_insertToAny_Singleton__chokuyo__aist__control_mHokuyoError _0RL_insertToAny_Singleton__chokuyo__aist__control_mHokuyoError_;
-void _0RL_delete_hokuyo__aist__control_mHokuyoSensorInfo(void* _data) {
- hokuyo_aist_control::HokuyoSensorInfo* _0RL_t = (hokuyo_aist_control::HokuyoSensorInfo*) _data;
- delete _0RL_t;
+static void _0RL_hokuyo__aist__control_mHokuyoSensorInfo_marshal_fn(cdrStream& _s, void* _v)
+{
+ hokuyo_aist_control::HokuyoSensorInfo* _p = (hokuyo_aist_control::HokuyoSensorInfo*)_v;
+ *_p >>= _s;
}
-
-static CORBA::Boolean
-_0RL_tcParser_getMemberDesc_hokuyo__aist__control_mHokuyoSensorInfo(const tcStructDesc *_desc, CORBA::ULong _index, tcDescriptor &_newdesc){
- switch (_index) {
- case 0:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->vendor);
- return 1;
- case 1:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->product);
- return 1;
- case 2:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->firmware);
- return 1;
- case 3:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->protocol);
- return 1;
- case 4:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->serial);
- return 1;
- case 5:
- _0RL_buildDesc_cstring(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->model);
- return 1;
- case 6:
- _0RL_buildDesc_clong(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->minRange);
- return 1;
- case 7:
- _0RL_buildDesc_clong(_newdesc, ((hokuyo_aist_control::HokuyoSensorInfo*)_desc->opq_struct)->maxRange);
- return 1;
- case 8:
- _0RL_...
[truncated message content] |