diff options
| author | bmendel <bmendel@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-16 19:33:57 +0000 |
|---|---|---|
| committer | bmendel <bmendel@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-02-16 19:33:57 +0000 |
| commit | b74b76564d877ce9b5fce592fb9226a576b40b1e (patch) | |
| tree | e0ac0a2edaddae9a20fb8fd0a9dcb4305b8f1ea6 | |
| parent | 196d66c2d48bf2188cbfb5f03f0d02d2103b69ac (diff) | |
| download | ATCD-b74b76564d877ce9b5fce592fb9226a576b40b1e.tar.gz | |
Modifications required for running on VxWorks with GHS.
| -rw-r--r-- | TAO/tao/default.bld | 2 | ||||
| -rw-r--r-- | TAO/tao/poa.cpp | 15 | ||||
| -rw-r--r-- | TAO/tao/tao.bld | 12 |
3 files changed, 27 insertions, 2 deletions
diff --git a/TAO/tao/default.bld b/TAO/tao/default.bld index 6feb286cf89..46fd517391f 100644 --- a/TAO/tao/default.bld +++ b/TAO/tao/default.bld @@ -16,7 +16,7 @@ tao.bld :cx_silent=21 :cx_silent=191 :cx_silent=610 - :sourcedirs=/home/ace/ACE_wrappers.vxworks + :sourcedirs=/home/ace/ACE_wrappers.latest :sourcedirs=.. :sourcedirs=./compat :libraries=/appl/newgreen/vxppc603/ghsbltin.o diff --git a/TAO/tao/poa.cpp b/TAO/tao/poa.cpp index ae27f478be8..9ccde7780c6 100644 --- a/TAO/tao/poa.cpp +++ b/TAO/tao/poa.cpp @@ -12,6 +12,14 @@ // auto_ptr class #include "ace/Auto_Ptr.h" +#if defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) +extern "C" +{ + u_int wslen (const CORBA::WChar *); + CORBA::WChar *wscpy (CORBA::WChar *, const CORBA::WChar *); +} +#endif /* ACE_HAS_WCHAR_TYPEDEFS_CHAR */ + // This is the maximum space require to convert the ulong into a string const int TAO_POA::max_space_required_for_ulong = 24; @@ -2714,7 +2722,12 @@ TAO_POA::wstring_to_ObjectId (const CORBA::WChar *id) // Size of Id // We DO NOT include the zero terminator, as this is simply an // artifact of the way strings are stored in C. - CORBA::ULong id_length = ACE_OS::strlen (id); +#if defined (ACE_HAS_WCHAR_TYPEDEFS_CHAR) + CORBA::ULong id_length = wslen (id) + 1; +#else /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ + CORBA::ULong id_length = ACE_OS::strlen (id) + 1; +#endif /* ! ACE_HAS_WCHAR_TYPEDEFS_CHAR */ + size_t bufsize = id_length * sizeof(CORBA::WChar); // Create the buffer for the Id diff --git a/TAO/tao/tao.bld b/TAO/tao/tao.bld index 46742df5ee0..ae2e949a07d 100644 --- a/TAO/tao/tao.bld +++ b/TAO/tao/tao.bld @@ -4,6 +4,8 @@ default: :defines=DEBUG any.cpp C++ +arg_shifter.cpp + C++ cdr.cpp C++ client_factory.cpp @@ -44,6 +46,8 @@ nvlist.cpp C++ object.cpp C++ +objkeyC.cpp + C++ objtable.cpp C++ optable.cpp @@ -56,10 +60,18 @@ params.cpp C++ poa.cpp C++ +poaC.cpp + C++ +poaS.cpp + C++ principa.cpp C++ request.cpp C++ +sequence.cpp + C++ +servant_base.cpp + C++ server_factory.cpp C++ svrrqst.cpp |