diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-20 13:03:35 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-20 13:03:35 +0000 |
| commit | 23f86478b0c0362888eeda7e70204569e4e2ad68 (patch) | |
| tree | 943f03f497e6df1b9ce82e460c9558fe59a9fe51 /TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h | |
| parent | cb361d315f8831cd572a3c415c5b4e24ecdec23d (diff) | |
| download | ATCD-23f86478b0c0362888eeda7e70204569e4e2ad68.tar.gz | |
Wed Oct 20 12:55:07 UTC 2010 Martin Corino <corino_m@remedy.nl>
* TAO_IDL/ast/ast_exception.cpp:
* TAO_IDL/ast/ast_sequence.cpp:
* TAO_IDL/ast/ast_structure.cpp:
* TAO_IDL/ast/ast_type.cpp:
* TAO_IDL/ast/ast_union.cpp:
* TAO_IDL/ast/ast_valuetype.cpp:
* TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
* TAO_IDL/be/be_visitor_typecode/union_typecode.cpp:
* TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
* TAO_IDL/include/ast_type.h:
Fixed incorrect (unnecessary) generation of Recursive typecodes.
* tao/AnyTypeCode/Recursive_Type_TypeCode.h:
* tao/AnyTypeCode/Recursive_Type_TypeCode.inl:
* tao/AnyTypeCode/Recursive_Type_TypeCode.cpp:
* tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp:
Fixed incorrect marshaling/demarshaling of Recursive typecodes
(specifically nested recursions) as well as incorrect reference
counting of recursive typecodes.
These changes fix Bugzilla #2804 and 2844.
Diffstat (limited to 'TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index f9ebdfab5ff..f09954a6344 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -146,10 +146,10 @@ namespace TAO class Reset { public: - Reset (bool & flag) : flag_ (flag) { } - ~Reset (void) { this->flag_ = false; } + Reset (CORBA::ULong & flag) : flag_ (flag) { } + ~Reset (void) { this->flag_ = 0; } private: - bool & flag_; + CORBA::ULong & flag_; }; private: @@ -163,7 +163,7 @@ namespace TAO * This flag is used to prevent @c TypeCode equality and * equivalence operations from recursing indefinitely. */ - mutable bool in_recursion_; + mutable CORBA::ULong recursion_start_offset_; /// Track whether data has been initialized. bool data_initialized_; |