diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-16 19:31:49 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-16 19:31:49 +0000 |
| commit | 974ea490d561133a993f92c7c8599e8299b260d4 (patch) | |
| tree | f96a69dec4397eeff2760669691126a24a8949f1 | |
| parent | 0a1fd96b456230d557bb99ddc64b8abbb5023535 (diff) | |
| download | ATCD-974ea490d561133a993f92c7c8599e8299b260d4.tar.gz | |
ChangeLogTag: Mon Aug 15 10:48:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tao/PortableServer/Fixed_Array_SArgument_T.h | 2 | ||||
| -rw-r--r-- | TAO/tao/ULongLongSeqC.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/ULongLongSeqC.h | 11 |
3 files changed, 3 insertions, 12 deletions
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h index 9cd2816b4da..369fd9afe4d 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h @@ -65,7 +65,7 @@ namespace TAO Inout_Fixed_Array_SArgument_T (void); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); - virtual CORBA::Boolean demarshal (TAO_InputCDR &); + virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp index 5df1499678b..69cc5082433 100644 --- a/TAO/tao/ULongLongSeqC.cpp +++ b/TAO/tao/ULongLongSeqC.cpp @@ -26,7 +26,7 @@ // http://www.cs.wustl.edu/~schmidt/TAO.html // TAO_IDL - Generated from -// be\be_codegen.cpp:288 +// be\be_codegen.cpp:277 #include "ULongLongSeqC.h" diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h index 0ec463e590e..523aaaee8f1 100644 --- a/TAO/tao/ULongLongSeqC.h +++ b/TAO/tao/ULongLongSeqC.h @@ -52,11 +52,6 @@ #endif #define TAO_EXPORT_MACRO TAO_Export -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - // TAO_IDL - Generated from // be\be_visitor_module/module_ch.cpp:49 @@ -142,11 +137,7 @@ TAO_Export CORBA::Boolean operator>> ( #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */ // TAO_IDL - Generated from -// be\be_codegen.cpp:1062 - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ +// be\be_codegen.cpp:1028 #include /**/ "ace/post.h" |