summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authorChris Cleeland <chris.cleeland@gmail.com>1997-11-18 23:36:42 +0000
committerChris Cleeland <chris.cleeland@gmail.com>1997-11-18 23:36:42 +0000
commitfb2c8aaab4d9c787007ef029fb223fbd0d95e0e9 (patch)
treea97507485782cfab6c40da417cf7fcfe5fe7fd23 /TAO
parentf6722af4e547c43d227e08743db9e9724c84b1e3 (diff)
downloadATCD-fb2c8aaab4d9c787007ef029fb223fbd0d95e0e9.tar.gz
* tao/corbacom.h: Added special case for CORBA::WChar to be a
short on VxWorks/GreenHills. * tao/deep_free.cpp (deep_free): Removed unused 'alignment' variable. * tao/deep_copy.cpp (deep_copy): Removed unused 'alignment' variable. * tao/encode.cpp (encode): Removed unused 'continue_encoding' variable. * tao/orbobj.cpp (POA_init): Removed options which were no longer supported/necessary, as well as their corresponding variables.
Diffstat (limited to 'TAO')
-rw-r--r--TAO/tao/corbacom.h4
-rw-r--r--TAO/tao/deep_copy.cpp161
-rw-r--r--TAO/tao/deep_free.cpp132
-rw-r--r--TAO/tao/encode.cpp5
-rw-r--r--TAO/tao/orbobj.cpp24
5 files changed, 141 insertions, 185 deletions
diff --git a/TAO/tao/corbacom.h b/TAO/tao/corbacom.h
index 9a169d42028..b6bcbc522c6 100644
--- a/TAO/tao/corbacom.h
+++ b/TAO/tao/corbacom.h
@@ -390,7 +390,11 @@ public:
//
// NOTE: those are IDL extensions, not yet standard.
+#if defined(VXWORKS) && defined(ghs)
+ typedef short WChar;
+#else
typedef wchar_t WChar;
+#endif
typedef WChar *WString;
typedef WChar &WChar_out; // out type for WChar
diff --git a/TAO/tao/deep_copy.cpp b/TAO/tao/deep_copy.cpp
index 13482037781..00b199cf777 100644
--- a/TAO/tao/deep_copy.cpp
+++ b/TAO/tao/deep_copy.cpp
@@ -1072,7 +1072,8 @@ TAO_Marshal_Except::deep_copy (CORBA::TypeCode_ptr tc,
{
CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
CORBA::TypeCode_ptr param;
- CORBA::Long size, alignment;
+ CORBA::Long size;
+
CDR stream;
if (tc)
@@ -1101,91 +1102,81 @@ TAO_Marshal_Except::deep_copy (CORBA::TypeCode_ptr tc,
size = param->size (env);
if (env.exception () == 0)
{
- // get the alignment of the field
- alignment = param->alignment (env);
- if (env.exception () == 0)
- {
- switch (param->kind_)
- {
- case CORBA::tk_null:
- case CORBA::tk_void:
- break;
- case CORBA::tk_short:
- case CORBA::tk_ushort:
- *(CORBA::Short *) dest = *(CORBA::Short *) source;
- break;
- case CORBA::tk_long:
- case CORBA::tk_ulong:
- case CORBA::tk_float:
- case CORBA::tk_enum:
- *(CORBA::Long *) dest = *(CORBA::Long *) source;
- break;
- case CORBA::tk_double:
- case CORBA::tk_longlong:
- case CORBA::tk_ulonglong:
- *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
- break;
- case CORBA::tk_boolean:
- *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
- break;
- case CORBA::tk_char:
- case CORBA::tk_octet:
- *(CORBA::Char *) dest = *(CORBA::Char *) source;
- break;
- case CORBA::tk_longdouble:
- *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
- break;
- case CORBA::tk_wchar:
- *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
- break;
- case CORBA::tk_any:
- retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_TypeCode:
- retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_Principal:
- retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_objref:
- retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_struct:
- retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_union:
- retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_string:
- retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_sequence:
- retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_array:
- retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_alias:
- retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_except:
- retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
- break;
- case CORBA::tk_wstring:
- retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
- break;
- default:
- retval = CORBA::TypeCode::TRAVERSE_STOP;
- } // end of switch
- source = (char *) source + size;
- dest = (char *) dest + size;
- }
- else // exception computing alignment
+ switch (param->kind_)
{
- dmsg ("TAO_Marshal_Struct::deep_copy detected error");
- return CORBA::TypeCode::TRAVERSE_STOP;
- }
- }
+ case CORBA::tk_null:
+ case CORBA::tk_void:
+ break;
+ case CORBA::tk_short:
+ case CORBA::tk_ushort:
+ *(CORBA::Short *) dest = *(CORBA::Short *) source;
+ break;
+ case CORBA::tk_long:
+ case CORBA::tk_ulong:
+ case CORBA::tk_float:
+ case CORBA::tk_enum:
+ *(CORBA::Long *) dest = *(CORBA::Long *) source;
+ break;
+ case CORBA::tk_double:
+ case CORBA::tk_longlong:
+ case CORBA::tk_ulonglong:
+ *(CORBA::LongLong *) dest = *(CORBA::LongLong *) source;
+ break;
+ case CORBA::tk_boolean:
+ *(CORBA::Boolean *) dest = *(CORBA::Boolean *) source;
+ break;
+ case CORBA::tk_char:
+ case CORBA::tk_octet:
+ *(CORBA::Char *) dest = *(CORBA::Char *) source;
+ break;
+ case CORBA::tk_longdouble:
+ *(CORBA::LongDouble *) dest = *(CORBA::LongDouble *) source;
+ break;
+ case CORBA::tk_wchar:
+ *(CORBA::WChar *) dest = *(CORBA::WChar *) source;
+ break;
+ case CORBA::tk_any:
+ retval = TAO_Marshal_Any::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_TypeCode:
+ retval = TAO_Marshal_TypeCode::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_Principal:
+ retval = TAO_Marshal_Principal::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_objref:
+ retval = TAO_Marshal_ObjRef::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_struct:
+ retval = TAO_Marshal_Struct::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_union:
+ retval = TAO_Marshal_Union::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_string:
+ retval = TAO_Marshal_String::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_sequence:
+ retval = TAO_Marshal_Sequence::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_array:
+ retval = TAO_Marshal_Array::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_alias:
+ retval = TAO_Marshal_Alias::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_except:
+ retval = TAO_Marshal_Except::deep_copy (param, source, dest, env);
+ break;
+ case CORBA::tk_wstring:
+ retval = TAO_Marshal_WString::deep_copy (param, source, dest, env);
+ break;
+ default:
+ retval = CORBA::TypeCode::TRAVERSE_STOP;
+ } // end of switch
+ source = (char *) source + size;
+ dest = (char *) dest + size;
+ }
else // exception computing size
{
dmsg ("TAO_Marshal_Struct::deep_copy detected error");
diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp
index b94184636d5..b932715be69 100644
--- a/TAO/tao/deep_free.cpp
+++ b/TAO/tao/deep_free.cpp
@@ -168,7 +168,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc,
{
CORBA::TypeCode::traverse_status retval = CORBA::TypeCode::TRAVERSE_CONTINUE;
CORBA::TypeCode_ptr param;
- CORBA::Long size, alignment;
+ CORBA::Long size;
CDR stream;
if (tc)
@@ -178,7 +178,7 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc,
if (env.exception () == 0)
{
for (int i = 0; i < member_count && retval ==
- CORBA::TypeCode::TRAVERSE_CONTINUE; i++)
+ CORBA::TypeCode::TRAVERSE_CONTINUE; i++)
{
// get the typecode for the ith field
param = tc->member_type (i, env);
@@ -188,75 +188,65 @@ TAO_Marshal_Struct::deep_free (CORBA::TypeCode_ptr tc,
size = param->size (env);
if (env.exception () == 0)
{
- // get the alignment of the field
- alignment = param->alignment (env);
- if (env.exception () == 0)
- {
- switch (param->kind_)
- {
- case CORBA::tk_null:
- case CORBA::tk_void:
- case CORBA::tk_short:
- case CORBA::tk_ushort:
- case CORBA::tk_long:
- case CORBA::tk_ulong:
- case CORBA::tk_float:
- case CORBA::tk_enum:
- case CORBA::tk_double:
- case CORBA::tk_longlong:
- case CORBA::tk_ulonglong:
- case CORBA::tk_boolean:
- case CORBA::tk_char:
- case CORBA::tk_octet:
- case CORBA::tk_longdouble:
- case CORBA::tk_wchar:
- break;
- case CORBA::tk_any:
- retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_TypeCode:
- retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_Principal:
- retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_objref:
- retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_struct:
- retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_union:
- retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_string:
- retval = TAO_Marshal_String::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_sequence:
- retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_array:
- retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_alias:
- retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_except:
- retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
- break;
- case CORBA::tk_wstring:
- retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
- break;
- default:
- retval = CORBA::TypeCode::TRAVERSE_STOP;
- } // end of switch
- source = (char *)source + size;
- }
- else // exception computing alignment
- {
- dmsg ("TAO_Marshal_Struct::deep_free detected error");
- return CORBA::TypeCode::TRAVERSE_STOP;
- }
+ switch (param->kind_)
+ {
+ case CORBA::tk_null:
+ case CORBA::tk_void:
+ case CORBA::tk_short:
+ case CORBA::tk_ushort:
+ case CORBA::tk_long:
+ case CORBA::tk_ulong:
+ case CORBA::tk_float:
+ case CORBA::tk_enum:
+ case CORBA::tk_double:
+ case CORBA::tk_longlong:
+ case CORBA::tk_ulonglong:
+ case CORBA::tk_boolean:
+ case CORBA::tk_char:
+ case CORBA::tk_octet:
+ case CORBA::tk_longdouble:
+ case CORBA::tk_wchar:
+ break;
+ case CORBA::tk_any:
+ retval = TAO_Marshal_Any::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_TypeCode:
+ retval = TAO_Marshal_TypeCode::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_Principal:
+ retval = TAO_Marshal_Principal::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_objref:
+ retval = TAO_Marshal_ObjRef::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_struct:
+ retval = TAO_Marshal_Struct::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_union:
+ retval = TAO_Marshal_Union::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_string:
+ retval = TAO_Marshal_String::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_sequence:
+ retval = TAO_Marshal_Sequence::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_array:
+ retval = TAO_Marshal_Array::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_alias:
+ retval = TAO_Marshal_Alias::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_except:
+ retval = TAO_Marshal_Except::deep_free (param, source, dest, env);
+ break;
+ case CORBA::tk_wstring:
+ retval = TAO_Marshal_WString::deep_free (param, source, dest, env);
+ break;
+ default:
+ retval = CORBA::TypeCode::TRAVERSE_STOP;
+ } // end of switch
+ source = (char *)source + size;
}
else // exception computing size
{
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp
index ff2bfb94050..09b74bba667 100644
--- a/TAO/tao/encode.cpp
+++ b/TAO/tao/encode.cpp
@@ -295,7 +295,6 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
void *context,
CORBA::Environment &env)
{
- CORBA::Boolean continue_encoding = CORBA::B_TRUE;
CDR *stream = (CDR *) context; // context is the CDR stream
// Current version: objref is really an IIOP_Object.
@@ -311,10 +310,6 @@ TAO_Marshal_ObjRef::encode (CORBA::TypeCode_ptr,
if (CORBA::is_nil (obj))
{
- continue_encoding =
- stream->put_ulong (1) // strlen
- && stream->put_char (0) // NUL
- && stream->put_ulong (0); // no profiles
return CORBA::TypeCode::TRAVERSE_CONTINUE;
}
else
diff --git a/TAO/tao/orbobj.cpp b/TAO/tao/orbobj.cpp
index 7b3c642c2f5..5c5687573f4 100644
--- a/TAO/tao/orbobj.cpp
+++ b/TAO/tao/orbobj.cpp
@@ -258,9 +258,6 @@ CORBA_ORB::POA_init (int &argc,
TAO_ORB_Core *oc = TAO_ORB_Core_instance ();
CORBA::POA_ptr rp;
CORBA::String_var id = poa_identifier;
- CORBA::String_var demux = CORBA::string_dup ("dynamic_hash"); // default, at least for now
- CORBA::ULong tablesize = 0; // default table size for lookup tables
- CORBA::Boolean use_threads = CORBA::B_FALSE;
CORBA::Environment env;
for (int i = 0; i < argc; )
@@ -275,27 +272,6 @@ CORBA_ORB::POA_init (int &argc,
if (i < argc)
id = CORBA::string_dup (argv[i++]);
}
- else if (ACE_OS::strcmp (argv[i], "-OAobjdemux") == 0)
- {
- // Specify the demultiplexing strategy to be used for object
- // demultiplexing
- i++;
- if (i < argc)
- demux = CORBA::string_dup (argv[i++]);
- }
- else if (ACE_OS::strcmp (argv[i], "-OAtablesize") == 0)
- {
- // Specify the size of the table used for object demultiplexing
- i++;
- if (i < argc)
- tablesize = ACE_OS::atoi (argv[i++]);
- }
- else if (ACE_OS::strcmp (argv[i], "-OAthread") == 0)
- {
- // Specify whether or not threads should be used.
- use_threads = CORBA::B_TRUE;
- i++;
- }
else
i++;
}
View Lorry Controller Status