diff options
| -rw-r--r-- | CIAO/ChangeLog | 16 | ||||
| -rw-r--r-- | CIAO/DAnCE/TargetManager/TargetManager.mpc | 2 | ||||
| -rw-r--r-- | CIAO/DAnCE/TargetManager/TargetManagerExt.idl | 2 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/ERE_Handler.h | 8 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/Utils/Functors.h | 2 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/XMLSchema/Types.hpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/Config_Handlers/XSCRT/Elements.hpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp | 4 | ||||
| -rw-r--r-- | CIAO/tools/IDL3_to_XMI/Literals.h | 2 | ||||
| -rw-r--r-- | CIAO/tools/XML/XML_Schema_Resolver.tpp | 2 | ||||
| -rw-r--r-- | CIAO/tools/XML/XercesString.h | 4 |
12 files changed, 34 insertions, 14 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index cb9b910f9bd..59bc72a7580 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,19 @@ +Wed May 20 01:41:39 UTC 2009 William R. Otte <wotte@dre.vanderbilt.edu> + + * DAnCE/TargetManager/TargetManager.mpc: + * DAnCE/TargetManager/TargetManagerExt.idl: + * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp: + * tools/Config_Handlers/ERE_Handler.h: + * tools/Config_Handlers/Utils/Functors.h: + * tools/Config_Handlers/XMLSchema/Types.hpp: + * tools/Config_Handlers/XSCRT/Elements.hpp: + * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp: + * tools/IDL3_to_XMI/Literals.h: + * tools/XML/XML_Schema_Resolver.tpp: + * tools/XML/XercesString.h: + + Updates for borland. + Thu May 14 19:12:56 UTC 2009 Abdullah Sowayan <sowayan@gmail.com> * MPC/config/cidlc.mpb: diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc index 962370d4b73..73d4406bbb4 100644 --- a/CIAO/DAnCE/TargetManager/TargetManager.mpc +++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc @@ -59,7 +59,7 @@ project(CIAO_TargetManager_exec) : ciao_output, ciao_executor, dance_domain_appl } } -project(CIAO_TargetManager_svnt) : ciao_output, ccm_svnt, ciao_servant, messaging, dance_deployment_svnt, ciao_config_handlers, avoids_ace_for_tao { +project(CIAO_TargetManager_svnt) : ciao_output, ccm_svnt, ciao_servant, messaging, dance_deployment_svnt, ciao_config_handlers, avoids_ace_for_tao, dance_node_manager { sharedname = CIAO_TargetManager_svnt libs += CIAO_TargetManager_stub CIAO_TargetManager_exec diff --git a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl index 390383312f2..934314b4613 100644 --- a/CIAO/DAnCE/TargetManager/TargetManagerExt.idl +++ b/CIAO/DAnCE/TargetManager/TargetManagerExt.idl @@ -53,7 +53,7 @@ module CIAO string host_; /// the node manager IOR - ::DAnCE::NodeManagerDaemon node_mgr_; + ::Deployment::NodeManager node_mgr_; }; /// Sequence of NodeManager. diff --git a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp index bca5d8f9342..bdffee8ecfc 100644 --- a/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp +++ b/CIAO/tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp @@ -108,7 +108,7 @@ namespace CIAO case TCKind::tk_octet_l: if (!req_tc) retval = this->daf_->create_dyn_any_from_type_code (CORBA::_tc_octet); - retval->insert_octet (static_cast <const unsigned char &> (*value.begin_octet ())); + retval->insert_octet (static_cast <const unsigned char &> (*(*(value.begin_octet ())))); break; case TCKind::tk_string_l: diff --git a/CIAO/tools/Config_Handlers/ERE_Handler.h b/CIAO/tools/Config_Handlers/ERE_Handler.h index 9d1fc412bce..3410b266e8a 100644 --- a/CIAO/tools/Config_Handlers/ERE_Handler.h +++ b/CIAO/tools/Config_Handlers/ERE_Handler.h @@ -55,13 +55,13 @@ namespace CIAO const Deployment::ExternalReferenceEndpoint& src); static void handle_external_ref_endpoint (const ExternalReferenceEndpoint &src, - Deployment::ExternalReferenceEndpoint &dest); + Deployment::ExternalReferenceEndpoint &dest); }; typedef Sequence_Handler < ExternalReferenceEndpoint, - ::Deployment::ExternalReferenceEndpoints, - ::Deployment::ExternalReferenceEndpoint, - ERE_Handler::handle_external_ref_endpoint > ERE_Functor; + ::Deployment::ExternalReferenceEndpoints, + ::Deployment::ExternalReferenceEndpoint, + ERE_Handler::handle_external_ref_endpoint > ERE_Functor; } } diff --git a/CIAO/tools/Config_Handlers/Utils/Functors.h b/CIAO/tools/Config_Handlers/Utils/Functors.h index 6a6aa03c46a..a14519b53a6 100644 --- a/CIAO/tools/Config_Handlers/Utils/Functors.h +++ b/CIAO/tools/Config_Handlers/Utils/Functors.h @@ -20,7 +20,7 @@ namespace CIAO template <typename Source, typename Dest, typename Dest_Type, -#if defined (__BORLANDC__) && (__BORLANDC__ == 0x564) +#if defined (__BORLANDC__) // && (__BORLANDC__ == 0x564) void (Func)(const Source &, Dest_Type &)> #else void (&Func)(const Source &, Dest_Type &)> diff --git a/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp b/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp index 0b0833ccfd5..c27c20731d2 100644 --- a/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp +++ b/CIAO/tools/Config_Handlers/XMLSchema/Types.hpp @@ -59,7 +59,7 @@ namespace XMLSchema typedef basic_string<C> Base__ ; public: - typedef ACE_Refcounted_Auto_Ptr < string, ACE_Null_Mutex > _ptr; + // typedef ACE_Refcounted_Auto_Ptr < string, ACE_Null_Mutex > _ptr; //@@ VC6 does not inject XSCRT::Type into the scope so I have // to qualify it all the time. diff --git a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp index 4bcf56e69f8..92f707e937f 100644 --- a/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp +++ b/CIAO/tools/Config_Handlers/XSCRT/Elements.hpp @@ -221,7 +221,7 @@ namespace XSCRT class FundamentalType : public Type { public: - typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr; + // typedef ACE_Refcounted_Auto_Ptr < FundamentalType, ACE_Null_Mutex > _ptr; FundamentalType () { diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp index a9afdf3d2a2..b0bd198761b 100644 --- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp +++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp @@ -2088,8 +2088,8 @@ namespace CIAO this->add_stereotype (ST_UNION, CLASS); this->add_stereotype (ST_USES, ASSOC); this->add_stereotype (ST_SEQ, CLASS); - this->add_stereotype (ST_ROE, _NULL); - this->add_stereotype (ST_RO, _NULL); + this->add_stereotype (ST_ROE, __NULL); + this->add_stereotype (ST_RO, __NULL); this->add_stereotype (ST_OBJ, DATATYPE); this->add_stereotype (ST_STR, DATATYPE); this->add_stereotype (ST_LD, DATATYPE); diff --git a/CIAO/tools/IDL3_to_XMI/Literals.h b/CIAO/tools/IDL3_to_XMI/Literals.h index 4e4d1175f6b..e8c36180b30 100644 --- a/CIAO/tools/IDL3_to_XMI/Literals.h +++ b/CIAO/tools/IDL3_to_XMI/Literals.h @@ -77,7 +77,7 @@ namespace CIAO CLASS, DATATYPE, PACKAGE, - _NULL, + __NULL, ATTR, PUBLIC, _PRIVATE, diff --git a/CIAO/tools/XML/XML_Schema_Resolver.tpp b/CIAO/tools/XML/XML_Schema_Resolver.tpp index 13ff6915e6b..22039e01f14 100644 --- a/CIAO/tools/XML/XML_Schema_Resolver.tpp +++ b/CIAO/tools/XML/XML_Schema_Resolver.tpp @@ -40,7 +40,7 @@ namespace CIAO return 0; // Ownership of these objects is given to other people. - return /*new Wrapper4InputSource*/ (new LocalFileInputSource (path)); + return /*new Wrapper4InputSource*/ (new LocalFileInputSource (path.begin ())); } } } diff --git a/CIAO/tools/XML/XercesString.h b/CIAO/tools/XML/XercesString.h index 11aa6fa7c4d..c07c62ec9b0 100644 --- a/CIAO/tools/XML/XercesString.h +++ b/CIAO/tools/XML/XercesString.h @@ -11,6 +11,10 @@ #include <iosfwd> +#ifdef __BORLANDC__ +using std::memcpy; +#endif + #include <xercesc/util/XMLString.hpp> // Utility class that provides a std::string like facade to XMLString. |