diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-07 15:48:09 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2003-03-07 15:48:09 +0000 |
| commit | e93d801f1a39eb2058220a3a4f38668432da09aa (patch) | |
| tree | 5073f9865b709b07d83f407a77f02ec80a6573c0 | |
| parent | 3ef47de3d2bc9d7343b0900bd94459c31906176c (diff) | |
| download | ATCD-e93d801f1a39eb2058220a3a4f38668432da09aa.tar.gz | |
ChangeLog tag: Fri Mar 7 09:34:06 2003 Phil Mesnier <mesnier_p@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Codeset_Translator_Factory_T.h | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8247d2073bf..efc93c8fa1f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,16 @@ +Fri Mar 7 09:34:06 2003 Phil Mesnier <mesnier_p@ociweb.com> + + * TAO_IDL/be/be_visitor_operation/operation.cpp: + * TAO_IDL/be/be_visitor_operation/operation_ss.cpp: The check for + codeset errors were calling the inputCDR's exception generator when + the OutputCDR was used. + + * tao/Codeset_Translator_Factory_T.h: Removed the TAO_Export + modifier from the template declaration. Some of the MSCV builds + were complaining about it, and it looks like the other templates + in TAO don't export when their base classes do. I referred to + the Sequence_T source for comparison. + Fri Mar 7 07:17:02 2003 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc: diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp index d7adda24a85..c4feac200ef 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp @@ -846,7 +846,7 @@ be_visitor_operation::gen_marshal_and_invoke ( << "{" << be_idt_nl; // If marshaling fails, raise exception (codesetting has various minors) - *os << "TAO_InputCDR::throw_stub_exception (errno " + *os << "TAO_OutputCDR::throw_stub_exception (errno " << "ACE_ENV_ARG_PARAMETER); " << be_nl; if (this->gen_check_interceptor_exception (bt) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp index b8c9e084a6c..d17a0abd99c 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp @@ -733,7 +733,7 @@ be_visitor_operation_ss::gen_marshal_params (be_operation *node, // If marshaling fails, raise exception (codesetting has minor codes) *os << "{" << be_idt_nl << be_nl - << "TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);" << be_nl + << "TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);" << be_nl << "ACE_CHECK;" << be_uidt_nl << "}" << be_nl; diff --git a/TAO/tao/Codeset_Translator_Factory_T.h b/TAO/tao/Codeset_Translator_Factory_T.h index 6f6c7d7e833..7f8be175079 100644 --- a/TAO/tao/Codeset_Translator_Factory_T.h +++ b/TAO/tao/Codeset_Translator_Factory_T.h @@ -16,7 +16,7 @@ #include "tao/Codeset_Translator_Factory.h" template<class NCS_TO_TCS> -class TAO_Export TAO_Codeset_Translator_Factory_T +class TAO_Codeset_Translator_Factory_T : public TAO_Codeset_Translator_Factory { public: |