diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-30 13:20:35 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-03-30 13:20:35 +0000 |
| commit | 3059666179b18da610e103483183dd3d79ad51cf (patch) | |
| tree | 077b5ef9dfb5b60e77e5bf627de45b6886579510 | |
| parent | a61d5b38db699d7f9cacc7e39f1fc2cc29955861 (diff) | |
| download | ATCD-3059666179b18da610e103483183dd3d79ad51cf.tar.gz | |
ChangeLogTag: Wed Mar 30 12:59:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp | 26 | ||||
| -rw-r--r-- | TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp index c4b5bce8f01..7072c71028b 100644 --- a/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp +++ b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp @@ -1,19 +1,19 @@ //$Id$ #include "DataType_Handler.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" namespace CIAO{ - + namespace Config_Handlers{ - + DataType_Handler::DataType_Handler (void) { } DataType_Handler::~DataType_Handler (void) { } - + ///This method takes a <CIAO::Config_Handlers::DataType> ///and returns the corresponding CORBA::TypeCode. void @@ -21,9 +21,9 @@ namespace CIAO{ CORBA::TypeCode_ptr& type, const DataType& desc) { - + TCKind kind (desc.kind ()); - + if (kind == TCKind::tk_null) type = CORBA::TypeCode::_duplicate (CORBA::_tc_null); else if (kind == TCKind::tk_short) @@ -60,20 +60,20 @@ namespace CIAO{ type = CORBA::TypeCode::_duplicate (CORBA::_tc_any); else if (kind == TCKind::tk_TypeCode) type = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode); - + // This case used to be supported...is it not in the schema? // else if (kind == TCKind::tk_Object) // type = CORBA::TypeCode::_duplicate (CORBA::_tc_Object);*/ - + } - DataType + DataType DataType_Handler::data_type ( const CORBA::TypeCode_ptr& src) { - + DataType type; - + if (src->kind () == ::CORBA::tk_null) type.kind (TCKind::tk_null); else if (src->kind () == CORBA::tk_short) @@ -111,8 +111,8 @@ namespace CIAO{ else if (src->kind () == CORBA::tk_TypeCode) type.kind (TCKind::tk_TypeCode); - return type; + return type; } - + } } diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp index c0fc774811c..3100a2b6bbb 100644 --- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp +++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp @@ -2,7 +2,7 @@ #include "DT_Handler.h" #include "Utils.h" -#include "tao/Typecode.h" +#include "tao/TypeCode.h" #include "ace/Auto_Ptr.h" #include "ace/OS_NS_string.h" |