diff options
19 files changed, 2890 insertions, 1183 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index a458a119307..1726dcff49b 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,57 @@ +Fri Dec 11 07:28:54 EST 1998 Aniruddha Gokhale <gokhale@sahyadri.research.bell-labs.com> + + * TAO_IDL/be/be_visitor_sequence.cpp: + + Added #include for newy added files described below. + + * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp: + TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp: + TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp: + TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp: + TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp: + TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp: + TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp: + + We no longer generate all the code for the base sequence classes + in the header file itself (Recall that these base sequence + classes are used for platforms that do not support template + specialization OR require explicit template instantiation). + Instead, the implementation of all the methods of the + classes is now generated in the *.i (inlined) file. The reason + for doing this was to handle problems with sequences of forward + declared interfaces. Code for sequences of forward declared + interfaces would use operations such as _duplicate, _nil, and + others that get defined only when the actual interface + definition is seen. To circumvent this problem, we now generate + only the class definition in the header file and all the + implementation is moved to the inline file. Thanks to Ron Barack + (rab@terminal.cz) for submitting the bugreport. + + In addition, I realized that these base sequence classes were + used only when the platform requires explicit template + instantiation or does not support template specialization. For + the other cases, the code for these base classes was never used + and it was unnecessarily increasing the footprint. Hence, we now + generate these base sequence classes and its associated inlined + code inside conditional macro which we call AHETI (please see + generated code). + + * TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp: + TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h: + + Added code and new methods so that code for the base sequence + classes can be generated in the *.i file. + + * TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp: + TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp: + TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp: + TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp: + TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp: + TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp: + + Newly added files that generate code for the base sequences in + the *.i file. + Thu Dec 10 21:48:08 1998 Kirthika Parameswaran <kirthika@cs.wustl.edu> * examples/Callback_Quoter/Consumer_Signal_Handler.h: diff --git a/TAO/TAO_IDL/Makefile b/TAO/TAO_IDL/Makefile index efbcaaf4663..92c68a32f8d 100644 --- a/TAO/TAO_IDL/Makefile +++ b/TAO/TAO_IDL/Makefile @@ -273,6 +273,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -311,6 +314,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -349,6 +355,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -387,6 +396,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -437,7 +449,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -452,8 +463,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -486,6 +495,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -524,9 +536,6 @@ tags: $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/Process_Manager.i .obj/drv_link.o .obj/drv_link.so .shobj/drv_link.o .shobj/drv_link.so: driver/drv_link.cpp include/idl.h \ @@ -545,6 +554,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -583,6 +595,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -621,9 +636,6 @@ tags: $(ACE_ROOT)/ace/Atomic_Op.i \ $(ACE_ROOT)/ace/Synch_T.cpp \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Process.i \ $(ACE_ROOT)/ace/Process_Manager.i \ $(ACE_ROOT)/ace/Env_Value_T.h \ @@ -645,6 +657,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -684,6 +699,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -723,6 +741,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -762,6 +783,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -801,6 +825,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -840,6 +867,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -879,6 +909,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -918,6 +951,9 @@ tags: $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/idl.h include/intlmacros.h include/idl_narrow.h \ include/idl_defines.h include/idl_fwd.h include/idl_bool.h \ @@ -957,6 +993,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -994,6 +1033,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1031,6 +1073,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1068,6 +1113,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1105,6 +1153,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1142,6 +1193,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1179,6 +1233,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1216,6 +1273,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1253,6 +1313,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1290,6 +1353,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1327,6 +1393,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1364,6 +1433,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1401,6 +1473,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1438,6 +1513,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1475,6 +1553,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1512,6 +1593,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1549,6 +1633,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1586,6 +1673,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1623,6 +1713,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1660,6 +1753,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1697,6 +1793,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1734,6 +1833,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1771,6 +1873,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1808,6 +1913,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1845,6 +1953,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1882,6 +1993,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1919,6 +2033,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1956,6 +2073,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -1993,6 +2113,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2030,6 +2153,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2067,6 +2193,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2104,6 +2233,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2141,6 +2273,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2178,6 +2313,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2215,6 +2353,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2252,6 +2393,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2289,6 +2433,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2326,6 +2473,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2363,6 +2513,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2400,6 +2553,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2437,6 +2593,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2474,6 +2633,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2511,6 +2673,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2548,6 +2713,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2585,6 +2753,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2622,6 +2793,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2659,6 +2833,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2709,7 +2886,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -2724,8 +2900,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -2758,6 +2932,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2808,7 +2985,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -2823,8 +2999,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -2857,6 +3031,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -2907,7 +3084,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -2922,8 +3098,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -2956,6 +3130,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3006,7 +3183,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3021,8 +3197,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3055,6 +3229,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3105,7 +3282,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3120,8 +3296,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3154,6 +3328,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3204,7 +3381,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3219,8 +3395,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3253,6 +3427,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3303,7 +3480,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3318,8 +3494,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3352,6 +3526,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3402,7 +3579,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3417,8 +3593,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3451,6 +3625,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3501,7 +3678,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3516,8 +3692,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3550,6 +3724,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3616,7 +3793,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3631,8 +3807,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3665,6 +3839,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3715,7 +3892,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3730,8 +3906,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3764,6 +3938,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3814,7 +3991,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3829,8 +4005,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3863,6 +4037,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -3913,7 +4090,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -3928,8 +4104,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -3962,6 +4136,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4012,7 +4189,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4027,8 +4203,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4061,6 +4235,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4111,7 +4288,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4126,8 +4302,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4160,6 +4334,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4210,7 +4387,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4225,8 +4401,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4259,6 +4433,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4309,7 +4486,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4324,8 +4500,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4369,6 +4543,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4419,7 +4596,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4434,8 +4610,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4468,6 +4642,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4518,7 +4695,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4533,8 +4709,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4567,6 +4741,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4617,7 +4794,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4632,8 +4808,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4666,6 +4840,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4716,7 +4893,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4731,8 +4907,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4765,6 +4939,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4815,7 +4992,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4830,8 +5006,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4864,6 +5038,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -4914,7 +5091,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -4929,8 +5105,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -4963,6 +5137,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5013,7 +5190,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5028,8 +5204,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5062,6 +5236,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5112,7 +5289,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5127,8 +5303,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5161,6 +5335,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5211,7 +5388,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5226,8 +5402,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5260,6 +5434,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5310,7 +5487,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5325,8 +5501,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5359,6 +5533,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5409,7 +5586,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5424,8 +5600,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5458,6 +5632,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5508,7 +5685,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5523,8 +5699,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5557,6 +5731,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5607,7 +5784,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5622,8 +5798,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5656,6 +5830,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5706,7 +5883,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5721,8 +5897,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5756,6 +5930,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5806,7 +5983,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5821,8 +5997,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5855,6 +6029,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -5905,7 +6082,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -5920,8 +6096,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -5954,6 +6128,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6004,7 +6181,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6019,8 +6195,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6054,6 +6228,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6104,7 +6281,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6119,8 +6295,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6316,6 +6490,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6363,7 +6540,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6378,8 +6554,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6412,6 +6586,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6459,7 +6636,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6474,8 +6650,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6537,6 +6711,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6587,7 +6764,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6602,8 +6778,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6649,6 +6823,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6699,7 +6876,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6714,8 +6890,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6752,6 +6926,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6802,7 +6979,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6817,8 +6993,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6857,6 +7031,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -6907,7 +7084,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -6922,8 +7098,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -6956,6 +7130,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7006,7 +7183,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7021,8 +7197,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7056,6 +7230,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7106,7 +7283,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7121,8 +7297,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7165,6 +7339,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7215,7 +7392,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7230,8 +7406,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7286,6 +7460,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7336,7 +7513,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7351,8 +7527,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7394,6 +7568,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7444,7 +7621,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7459,8 +7635,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7509,8 +7683,7 @@ tags: be/be_visitor_interface/cdr_op_ch.cpp \ be/be_visitor_interface/cdr_op_cs.cpp .obj/be_visitor_interface_fwd.o .obj/be_visitor_interface_fwd.so .shobj/be_visitor_interface_fwd.o .shobj/be_visitor_interface_fwd.so: be/be_visitor_interface_fwd.cpp \ - include/idl.h \ - $(ACE_ROOT)/ace/ACE.h \ + include/idl.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ @@ -7525,6 +7698,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7575,7 +7751,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7590,8 +7765,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7632,6 +7805,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7682,7 +7858,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7697,8 +7872,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7739,6 +7912,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7789,7 +7965,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7804,8 +7979,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -7891,6 +8064,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -7941,7 +8117,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -7956,8 +8131,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8004,6 +8177,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8054,7 +8230,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8069,8 +8244,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8104,6 +8277,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8154,7 +8330,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8169,8 +8344,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8213,7 +8386,13 @@ tags: be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp \ be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp \ be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp \ - be/be_visitor_sequence/gen_object_manager_ch.cpp + be/be_visitor_sequence/gen_object_manager_ch.cpp \ + be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp \ + be/be_visitor_sequence/gen_bounded_sequence_ci.cpp \ + be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp \ + be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp \ + be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp \ + be/be_visitor_sequence/gen_object_manager_ci.cpp .obj/be_visitor_structure.o .obj/be_visitor_structure.so .shobj/be_visitor_structure.o .shobj/be_visitor_structure.so: be/be_visitor_structure.cpp include/idl.h \ $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ @@ -8230,6 +8409,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8280,7 +8462,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8295,8 +8476,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8347,6 +8526,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8397,7 +8579,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8412,8 +8593,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8451,6 +8630,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8501,7 +8683,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8516,8 +8697,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8567,6 +8746,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8617,7 +8799,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8632,8 +8813,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ @@ -8670,8 +8849,7 @@ tags: be/be_visitor_union/any_op_cs.cpp be/be_visitor_union/cdr_op_ch.cpp \ be/be_visitor_union/cdr_op_cs.cpp .obj/be_visitor_union_branch.o .obj/be_visitor_union_branch.so .shobj/be_visitor_union_branch.o .shobj/be_visitor_union_branch.so: be/be_visitor_union_branch.cpp \ - include/idl.h \ - $(ACE_ROOT)/ace/ACE.h \ + include/idl.h $(ACE_ROOT)/ace/ACE.h \ $(ACE_ROOT)/ace/OS.h \ $(ACE_ROOT)/ace/inc_user_config.h \ $(ACE_ROOT)/ace/config.h \ @@ -8686,6 +8864,9 @@ tags: $(ACE_ROOT)/ace/Log_Record.h \ $(ACE_ROOT)/ace/ACE.i \ $(ACE_ROOT)/ace/Log_Priority.h \ + $(ACE_ROOT)/ace/SString.h \ + $(ACE_ROOT)/ace/SString.i \ + $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Log_Record.i \ include/intlmacros.h include/idl_narrow.h include/idl_defines.h \ include/idl_fwd.h include/idl_bool.h include/utl_string.h \ @@ -8736,7 +8917,6 @@ tags: $(ACE_ROOT)/ace/Containers_T.i \ $(ACE_ROOT)/ace/Containers_T.cpp \ $(ACE_ROOT)/ace/Malloc.h \ - $(ACE_ROOT)/ace/Malloc_Base.h \ $(ACE_ROOT)/ace/Malloc.i \ $(ACE_ROOT)/ace/Malloc_T.h \ $(ACE_ROOT)/ace/Free_List.h \ @@ -8751,8 +8931,6 @@ tags: $(ACE_ROOT)/ace/Mem_Map.i \ $(ACE_ROOT)/ace/Memory_Pool.i \ $(ACE_ROOT)/ace/Process.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ $(ACE_ROOT)/ace/Process.i \ be_include/be_decl.h be_include/be_scope.h be_include/be_generator.h \ be_include/be_type.h be_include/be_predefined_type.h \ diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp index 4ca0e85f1ce..6778b9d9ee3 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp @@ -38,6 +38,12 @@ #include "be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp" #include "be_visitor_sequence/gen_bounded_str_sequence_ch.cpp" #include "be_visitor_sequence/gen_object_manager_ch.cpp" +#include "be_visitor_sequence/gen_unbounded_sequence_ci.cpp" +#include "be_visitor_sequence/gen_bounded_sequence_ci.cpp" +#include "be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp" +#include "be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp" +#include "be_visitor_sequence/gen_bounded_str_sequence_ci.cpp" +#include "be_visitor_sequence/gen_object_manager_ci.cpp" ACE_RCSID(be, be_visitor_sequence, "$Id$") diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp index e111eea95ab..7f140102d09 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ch.cpp @@ -16,6 +16,8 @@ // = AUTHOR // Michael Kircher // +// Modifications by Aniruddha Gokhale +// // ============================================================================ #include "be.h" @@ -66,6 +68,10 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) const char * object_manager = node->object_manager_name (); + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + os->gen_ifdef_macro (class_name); os->indent (); @@ -76,13 +82,8 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) << "// = Initialization and termination methods." << be_nl << be_nl; - // constructor - *os << class_name << " (void)" << be_idt_nl - << " : TAO_Bounded_Base_Sequence (" << node->max_size () - << ", allocbuf (" << node->max_size () << "))" << be_uidt_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + // default constructor + *os << class_name << " (void);" << be_nl; // constructor *os << class_name << " (CORBA::ULong length," << be_idt_nl; @@ -98,199 +99,53 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) -1); } *os <<"* *value," << be_nl - << "CORBA::Boolean release=0)" << be_uidt_nl - << "// Constructor from data." << be_nl - << " : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl - << "{" << be_nl - << " this->_allocate_buffer (" << node->max_size () << ");" << be_nl - << "}" << be_nl - << be_nl; + << "CORBA::Boolean release = 0);" << be_uidt_nl; // constructor - *os << class_name << " (const " << class_name << " &rhs)" << be_nl - << "// Copy constructor." << be_idt_nl - << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **tmp1 = allocbuf (" << node->max_size () << ");" << be_nl; - pt->accept(visitor); *os <<" ** const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << "** ACE_CAST_CONST, rhs.buffer_);" << be_nl - << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl - << "tmp1[i] = "; pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl - << "this->buffer_ = tmp1;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (const " << class_name << " &rhs);" << be_nl + << "// Copy constructor." << be_nl; // destructor - *os << "~" << class_name << " (void)" << be_nl - << "// destructor" << be_nl - << "{" << be_idt_nl - << "this->_deallocate_buffer ();" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "~" << class_name << " (void);" << be_nl + << "// destructor" << be_nl; // operator= - *os << class_name << " &operator= (const " << class_name << " &rhs)" << be_nl - << "// Assignment from another Bounded sequence." << be_nl - << "{" << be_idt_nl - << "if (this == &rhs)" << be_idt_nl - << "return *this;" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " **, this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (tmp[i]);" << be_nl - << "tmp[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << "}" << be_nl - << "// No need to reallocate the buffer since it is always of size" << be_nl - << "// " << node->max_size () << "" << be_nl - << "#if 0" << be_idt_nl - << "if (this->maximum_ < rhs.maximum_)" << be_nl - << "{" << be_idt_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << "}" << be_uidt_nl - << "#endif /* 0 */" << be_uidt_nl - << "}" << be_nl - << "else" << be_idt_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << be_nl - << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl - << be_nl; - pt->accept(visitor); *os <<" **tmp1 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " **, this->buffer_);" << be_nl; - pt->accept(visitor); *os <<" ** const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl - << "for (CORBA::ULong i=0; i < rhs.length_; ++i)" << be_idt_nl - << "tmp1[i] = "; pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl - << "return *this;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " &operator= (const " << class_name << " &rhs);" << be_nl + << "// Assignment from another Bounded sequence." << be_nl; // operator[] - *os << object_manager << " operator[] (CORBA::ULong index) const // Read-write accessor." << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (index < this->maximum_);" << be_nl; - pt->accept(visitor); *os <<" **const tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl - << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << object_manager << " operator[] (CORBA::ULong index) const;" + << "// Read-write accessor." << be_nl; // allocbuf - *os << "static "; pt->accept (visitor); *os << " **allocbuf (CORBA::ULong length) // Allocate storage for a sequence.." << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **buf;" << be_nl - << be_nl - << "ACE_NEW_RETURN (buf, "; pt->accept (visitor); *os << "*[" << node->max_size () << "], 0);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl - << "buf[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << be_nl - << "return buf;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "static "; + pt->accept (visitor); + *os << " **allocbuf (CORBA::ULong length); " + << "// Allocate storage for a sequence.." << be_nl; // freebuf - *os << "static void freebuf ("; pt->accept (visitor); *os << " **buffer)" << be_nl - << "{" << be_idt_nl - << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" << be_idt_nl - << "if (buffer[i] != "; pt->accept (visitor); *os << "::_nil ())" << be_nl - << "{" << be_idt_nl - << "CORBA::release (buffer[i]);" << be_nl - << "buffer[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << "}" << be_uidt_nl - << be_nl - << "delete[] buffer;" << be_uidt_nl - << "} " << be_nl - << be_nl; + *os << "static void freebuf ("; + pt->accept (visitor); + *os << " **buffer);" << be_nl; // allocate_buffer *os << "// The Base_Sequence functions, please see tao/sequence.h" << be_nl - << "virtual void _allocate_buffer (CORBA::ULong length)" << be_nl - << "{" << be_idt_nl - << "// For this class memory is never reallocated so the implementation" << be_nl - << "// is *really* simple." << be_nl - << "this->buffer_ = allocbuf (length);" << be_uidt_nl - << "}" << be_nl - << be_nl; + << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl; // deallocate_buffer - *os << "virtual void _deallocate_buffer (void)" << be_nl - << "{" << be_idt_nl - << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl - << "return;" << be_uidt_nl; - pt->accept(visitor); *os <<" **tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " **, this->buffer_);" << be_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = 0;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _deallocate_buffer (void);" << be_nl; // get_buffer - pt->accept(visitor); *os << "* *get_buffer (CORBA::Boolean orphan = 0)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os << " **result = 0;" << be_nl - << "if (orphan == 0)" << be_nl - << "{" << be_idt_nl - << "// We retain ownership." << be_nl - << "if (this->buffer_ == 0)" << be_nl - << "{" << be_idt_nl - << "result = allocbuf (this->maximum_);" << be_nl - << "this->buffer_ = result;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "result = ACE_reinterpret_cast ("; - pt->accept (visitor); - *os << "**, this->buffer_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else // if (orphan == 1)" << be_nl - << "{" << be_idt_nl - << "if (this->release_ != 0)" << be_nl - << "{" << be_idt_nl - << "// We set the state back to default and relinquish" << be_nl - << "// ownership." << be_nl - << "result = ACE_reinterpret_cast("; pt->accept (visitor); *os << "**,this->buffer_);" << be_nl - << "this->maximum_ = 0;" << be_nl - << "this->length_ = 0;" << be_nl - << "this->buffer_ = 0;" << be_nl - << "this->release_ = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "return result;" << be_uidt_nl - << "}" << be_nl - << be_nl; + pt->accept(visitor); + *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl; // get_buffer - *os << "const "; pt->accept (visitor); *os << "* *get_buffer (void) const" << be_nl - << "{" << be_idt_nl - << "return ACE_reinterpret_cast(const "; - pt->accept (visitor); - *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "const "; + pt->accept (visitor); + *os << "* *get_buffer (void) const;" << be_nl; // _shrink_buffer - *os << "virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); - *os <<" **tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); - *os << " **, this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (tmp[i]);" << be_nl - << "tmp[i] = "; - pt->accept (visitor); - *os << "::_nil ();" << be_uidt_nl - << "}" << be_uidt_nl - << "}\n" << be_nl; + *os << "virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);" << be_nl; be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt); if ((pt->node_type () != AST_Decl::NT_pre_defined) || @@ -301,33 +156,19 @@ be_visitor_sequence_ch::gen_bounded_obj_sequence (be_sequence *node) *os << "virtual void _downcast (" << be_idt << be_idt_nl << "void* target," << be_nl << "CORBA_Object *src," << be_nl - << "CORBA::Environment &_env = " << be_idt_nl + << "CORBA_Environment &_env = " << be_idt_nl << "CORBA::Environment::default_environment ()" << be_uidt << be_uidt_nl - << ")" << be_uidt_nl - << "{" << be_idt_nl; - pt->accept (visitor); - *os << " **tmp = ACE_static_cast ("; - pt->accept (visitor); - *os << "**, target);" << be_nl - << "*tmp = "; - pt->accept (visitor); - *os << "::_narrow (src, _env);" << be_uidt_nl - << "}\n" << be_nl; - - *os << "virtual CORBA_Object* _upcast (void *src) const" << be_nl - << "{" << be_idt_nl; - pt->accept (visitor); - *os << " **tmp = ACE_static_cast ("; - pt->accept (visitor); - *os << "**, src);" << be_nl - << "return *tmp;" << be_uidt_nl - << "}" << be_nl; + << ");" << be_uidt_nl; + + *os << "virtual CORBA_Object* _upcast (void *src) const;" << be_nl; } *os << be_uidt_nl << "};\n"; os->gen_endif (); + // generate #endif for AHETI + os->gen_endif_AHETI (); delete visitor; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp new file mode 100644 index 00000000000..6f80730ee06 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_obj_sequence_ci.cpp @@ -0,0 +1,419 @@ +// +// $Id$ +// + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// gen_bounded_obj_sequence_ci.cpp +// +// = DESCRIPTION +// Visitor generating code for Sequence in the client inline +// +// = AUTHOR +// Michael Kircher +// +// Modifications by Aniruddha Gokhale +// ============================================================================ + +#include "be.h" + +#include "be_visitor_sequence.h" + +ACE_RCSID(be_visitor_sequence, gen_bounded_obj_sequence_ci, "$Id$") + + +int +be_visitor_sequence_ci::gen_bounded_obj_sequence (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + // retrieve the base type since we may need to do some code + // generation for the base type. + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "Bad element type\n"), -1); + } + + // generate the class name + be_type *pt; // base types + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // get the primitive base type of this typedef node + be_typedef *t = be_typedef::narrow_from_decl (bt); + pt = t->primitive_base_type (); + } + else + pt = bt; + + const char * class_name = node->instance_name (); + + static char full_class_name [NAMEBUFSIZE]; + ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (full_class_name, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + class_name); + } + else + { + ACE_OS::sprintf (full_class_name, "%s", + class_name); + } + + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + + this->gen_object_manager (node); + // Generate the code for the object manager + + static char object_manager [NAMEBUFSIZE]; + ACE_OS::memset (object_manager, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (object_manager, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + node->object_manager_name ()); + } + else + { + ACE_OS::sprintf (object_manager, "%s", + node->object_manager_name ()); + } + + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + + os->gen_ifdef_macro (class_name); + + os->indent (); + + // constructor + *os << "// default ctor" << be_nl; + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (void)" << be_idt_nl + << " : TAO_Bounded_Base_Sequence (" << node->max_size () + << ", allocbuf (" << node->max_size () << "))" << be_uidt_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name + << " (CORBA::ULong length," << be_idt_nl; + // the accept is here the first time used and if an + // error occurs, it will occur here. Later no check + // for errors will be done. + if (pt->accept (visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "base type visit failed\n"), + -1); + } + *os <<"* *value," << be_nl + << "CORBA::Boolean release)" << be_uidt_nl + << "// Constructor from data." << be_nl + << " : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl + << "{" << be_nl + << " this->_allocate_buffer (" << node->max_size () << ");" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (const " + << full_class_name << " &rhs)" << be_nl + << "// Copy constructor." << be_idt_nl + << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp1 = allocbuf (" << node->max_size () << ");" << be_nl; + pt->accept(visitor); + *os <<" ** const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "** ACE_CAST_CONST, rhs.buffer_);" << be_nl + << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl + << "tmp1[i] = "; pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl + << "this->buffer_ = tmp1;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // destructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::~" << class_name << " (void)" << be_nl + << "// destructor" << be_nl + << "{" << be_idt_nl + << "this->_deallocate_buffer ();" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // assignment operator + *os << "ACE_INLINE " << full_class_name << " &" << be_nl + << full_class_name << "::operator= (const " + << full_class_name << " &rhs)" << be_nl + << "// Assignment from another Bounded sequence." << be_nl + << "{" << be_idt_nl + << "if (this == &rhs)" << be_idt_nl + << "return *this;" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " **, this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (tmp[i]);" << be_nl + << "tmp[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << "}" << be_nl + << "// No need to reallocate the buffer since it is always of size" << be_nl + << "// " << node->max_size () << "" << be_nl + << "#if 0" << be_idt_nl + << "if (this->maximum_ < rhs.maximum_)" << be_nl + << "{" << be_idt_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << "}" << be_uidt_nl + << "#endif /* 0 */" << be_uidt_nl + << "}" << be_nl + << "else" << be_idt_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << be_nl + << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl + << be_nl; + pt->accept(visitor); + *os <<" **tmp1 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " **, this->buffer_);" << be_nl; + pt->accept(visitor); + *os <<" ** const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl + << "for (CORBA::ULong i=0; i < rhs.length_; ++i)" << be_idt_nl + << "tmp1[i] = "; + pt->accept (visitor); + *os << "::_duplicate (tmp2[i]);" << be_uidt_nl + << "return *this;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator[] + *os << "ACE_INLINE " << object_manager << be_nl + << full_class_name << "::operator[] (CORBA::ULong index) const" + << " // Read-write accessor." << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (index < this->maximum_);" << be_nl; + pt->accept(visitor); + *os <<" **const tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl + << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocbuf + *os << "ACE_INLINE "; pt->accept (visitor); + *os << " **" << be_nl; + *os << full_class_name << "::allocbuf (CORBA::ULong length) " + << "// Allocate storage for a sequence.." << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **buf;" << be_nl + << be_nl + << "ACE_NEW_RETURN (buf, "; + pt->accept (visitor); + *os << "*[" << node->max_size () << "], 0);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl + << "buf[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << be_nl + << "return buf;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // freebuf + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::freebuf ("; + pt->accept (visitor); + *os << " **buffer)" << be_nl + << "{" << be_idt_nl + << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" << be_idt_nl + << "if (buffer[i] != "; + pt->accept (visitor); + *os << "::_nil ())" << be_nl + << "{" << be_idt_nl + << "CORBA::release (buffer[i]);" << be_nl + << "buffer[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << "}" << be_uidt_nl + << be_nl + << "delete[] buffer;" << be_uidt_nl + << "} " << be_nl + << be_nl; + + // allocate_buffer + *os << "// The Base_Sequence functions, please see tao/sequence.h" << be_nl + << "ACE_INLINE void " << be_nl + << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl + << "{" << be_idt_nl + << "// For this class memory is never reallocated so the implementation" << be_nl + << "// is *really* simple." << be_nl + << "this->buffer_ = allocbuf (length);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // deallocate_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_deallocate_buffer (void)" << be_nl + << "{" << be_idt_nl + << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl + << "return;" << be_uidt_nl; + pt->accept(visitor); + *os <<" **tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " **, this->buffer_);" << be_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = 0;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE "; + pt->accept(visitor); + *os << " **" << be_nl; + *os << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os << " **result = 0;" << be_nl + << "if (orphan == 0)" << be_nl + << "{" << be_idt_nl + << "// We retain ownership." << be_nl + << "if (this->buffer_ == 0)" << be_nl + << "{" << be_idt_nl + << "result = allocbuf (this->maximum_);" << be_nl + << "this->buffer_ = result;" << be_uidt_nl + << "}" << be_nl + << "else" << be_nl + << "{" << be_idt_nl + << "result = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "**, this->buffer_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else // if (orphan == 1)" << be_nl + << "{" << be_idt_nl + << "if (this->release_ != 0)" << be_nl + << "{" << be_idt_nl + << "// We set the state back to default and relinquish" << be_nl + << "// ownership." << be_nl + << "result = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "**,this->buffer_);" << be_nl + << "this->maximum_ = 0;" << be_nl + << "this->length_ = 0;" << be_nl + << "this->buffer_ = 0;" << be_nl + << "this->release_ = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "return result;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE const "; + pt->accept (visitor); + *os << "* *" << be_nl + << full_class_name << "::get_buffer (void) const" << be_nl + << "{" << be_idt_nl + << "return ACE_reinterpret_cast(const "; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // _shrink_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " **, this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (tmp[i]);" << be_nl + << "tmp[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << "}" << be_uidt_nl + << "}\n" << be_nl; + + be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt); + if ((pt->node_type () != AST_Decl::NT_pre_defined) || + (prim && (prim->pt () == AST_PredefinedType::PT_pseudo) && + (!ACE_OS::strcmp (prim->local_name ()->get_string (), "Object")))) + { + // Pseudo objects do not require this methods. + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_downcast (" << be_idt << be_idt_nl + << "void* target," << be_nl + << "CORBA_Object *src," << be_nl + << "CORBA::Environment &_env = " << be_idt_nl + << "CORBA::Environment::default_environment ()" + << be_uidt << be_uidt_nl + << ")" << be_uidt_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os << " **tmp = ACE_static_cast ("; + pt->accept (visitor); + *os << "**, target);" << be_nl + << "*tmp = "; + pt->accept (visitor); + *os << "::_narrow (src, _env);" << be_uidt_nl + << "}\n" << be_nl; + + *os << "ACE_INLINE CORBA_Object*" << be_nl + << full_class_name << "::_upcast (void *src) const" << be_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os << " **tmp = ACE_static_cast ("; + pt->accept (visitor); + *os << "**, src);" << be_nl + << "return *tmp;" << be_uidt_nl + << "}" << be_nl; + } + + os->gen_endif (); + + // generate #endif for AHETI + os->gen_endif_AHETI(); + + delete visitor; + return 0; +} + diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp index 394ce0d424a..31991dae6f7 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ch.cpp @@ -14,6 +14,8 @@ // = AUTHOR // Michael Kircher // +// Modifications by Aniruddha Gokhale +// // ============================================================================ //#include "idl.h" @@ -62,6 +64,10 @@ be_visitor_sequence_ch::gen_bounded_sequence (be_sequence *node) ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH); be_visitor *visitor = tao_cg->make_visitor (&ctx); + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + os->gen_ifdef_macro (class_name); os->indent (); @@ -72,200 +78,76 @@ be_visitor_sequence_ch::gen_bounded_sequence (be_sequence *node) << "// = Initialization and termination methods." << be_nl << be_nl; - // Constructor - *os << class_name << " (void)" << be_nl - << "// Default constructor." << be_nl - << " : TAO_Bounded_Base_Sequence (" << node->max_size () - << ", 0, allocbuf (" << node->max_size () << "), 0)" << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + // default Constructor + *os << class_name << " (void);" << be_nl; // constructor *os << class_name << " (CORBA::ULong length," << be_idt_nl; - pt->accept (visitor); *os <<" *data," << be_nl - << "CORBA::Boolean release=0)" << be_uidt_nl - << "// Constructor using the data and memory management flag." << be_nl - << " : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, data, release)" << be_nl - << "{" << be_nl - << " this->_allocate_buffer (" << node->max_size () << ");" << be_nl - << "}" << be_nl - << be_nl; + pt->accept (visitor); + *os <<" *data," << be_nl + << "CORBA::Boolean release = 0);" << be_uidt_nl; // constructor - *os << class_name << " (const " << class_name << " &rhs)" << be_nl - << "// Copy constructor." << be_idt_nl - << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" *tmp1 = allocbuf (" << node->max_size () << ");" << be_nl - << be_nl; - pt->accept(visitor); *os <<" * const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl - << "tmp1[i] = tmp2[i];" << be_uidt_nl - << be_nl - << "this->buffer_ = tmp1;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (const " << class_name << " &rhs);" << be_nl + << "// Copy constructor." << be_nl; // operator= - *os << class_name << " &operator= (const " << class_name << " &rhs)" << be_nl - << "// Assignment operator. " << be_nl - << "{" << be_idt_nl - << "if (this == &rhs)" << be_idt_nl - << "return *this;" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_nl - << "{" << be_nl - << "}" << be_nl - << "else" << be_idt_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_nl - << be_nl - <<"TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl - << be_nl; - pt->accept(visitor); *os <<"* tmp1 = ACE_reinterpret_cast ("; - pt->accept(visitor); *os << " *, this->buffer_);" << be_nl; - pt->accept(visitor); *os <<"* const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl - << "tmp1[i] = tmp2[i];" << be_uidt_nl - << be_nl - << "return *this;" << be_uidt_nl << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " &operator= (const " << class_name << " &rhs);" << be_nl + << "// Assignment operator. " << be_nl; // destructor - *os << "~" << class_name << " (void) // Dtor." << be_nl - << "{" << be_idt_nl - << "this->_deallocate_buffer ();" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "~" << class_name << " (void); // Dtor." << be_nl; // Accessors + // operator[] *os << "// = Accessors." << be_nl; - pt->accept(visitor); *os <<" &operator[] (CORBA::ULong i)// operator []" << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (i < this->maximum_);" << be_nl; - pt->accept(visitor); *os <<" *tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << "*,this->buffer_);" << be_nl - << "return tmp[i];" << be_uidt_nl - << "}" << be_nl - << be_nl - << "const "; pt->accept (visitor); *os << " &operator[] (CORBA::ULong i) const// operator []" << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (i < this->maximum_);" << be_nl - << "const "; pt->accept (visitor); *os << "* tmp = ACE_reinterpret_cast (const "; - pt->accept (visitor); *os << "* ACE_CAST_CONST,this->buffer_);" << be_nl - << "return tmp[i];" << be_uidt_nl - << "}" << be_nl - << be_nl; + pt->accept(visitor); + *os <<" &operator[] (CORBA::ULong i);// operator []" << be_nl; + + // operator[] + *os << "const "; + pt->accept (visitor); + *os << " &operator[] (CORBA::ULong i) const;" << be_nl; // Static Operations *os << "// = Static operations." << be_nl - << "static "; pt->accept (visitor); *os << " *allocbuf (CORBA::ULong) // Allocate storage for the sequence." << be_nl - << "{" << be_idt_nl - << "return new "; pt->accept (visitor); *os << "[" << node->max_size () << "];" << be_uidt_nl - << "}" << be_nl - << be_nl; + << "static "; + pt->accept (visitor); + *os << " *allocbuf (CORBA::ULong); // Allocate storage for the sequence." << be_nl; // free_buf - *os << "static void freebuf ("; pt->accept (visitor); *os << " *buffer) // Free the sequence." << be_nl - << "{" << be_idt_nl - << "delete [] buffer;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "static void freebuf ("; + pt->accept (visitor); + *os << " *buffer); // Free the sequence." << be_nl; // allocate_buffer - *os << "virtual void _allocate_buffer (CORBA::ULong length)" << be_nl - << "// allocate a buffer of the requested length. The buffer is allocated for the" << be_nl - << "// right type" << be_nl - << "{" << be_idt_nl - << "this->buffer_ = allocbuf (" << node->max_size () << ");" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl; // deallocate_buffer - *os << "virtual void _deallocate_buffer (void)" << be_nl - << "// deallocate the buffer" << be_nl - << "{" << be_idt_nl - << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl - << "return;" << be_uidt_nl; - pt->accept(visitor); *os <<" *tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " *, this->buffer_);" << be_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = 0;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _deallocate_buffer (void);" << be_nl; // get_buffer - pt->accept(visitor); *os << " *get_buffer (CORBA::Boolean orphan = 0)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os << " *result = 0;" << be_nl - << "if (orphan == 0)" << be_nl - << "{" << be_idt_nl - << "// We retain ownership." << be_nl - << "if (this->buffer_ == 0)" << be_nl - << "{" << be_idt_nl - << "result = allocbuf (this->maximum_);" << be_nl - << "this->buffer_ = result;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "result = ACE_reinterpret_cast ("; - pt->accept (visitor); - *os << "*, this->buffer_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else // if (orphan == 1)" << be_nl - << "{" << be_idt_nl - << "if (this->release_ != 0)" << be_nl - << "{" << be_idt_nl - << "// We set the state back to default and relinquish" << be_nl - << "// ownership." << be_nl - << "result = ACE_reinterpret_cast("; pt->accept (visitor); *os << "*,this->buffer_);" << be_nl - << "this->maximum_ = 0;" << be_nl - << "this->length_ = 0;" << be_nl - << "this->buffer_ = 0;" << be_nl - << "this->release_ = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "return result;" << be_uidt_nl - << "}" << be_nl - << be_nl; + pt->accept(visitor); + *os << " *get_buffer (CORBA::Boolean orphan = 0);" << be_nl; // get_buffer - *os << "const "; pt->accept (visitor); *os << " *get_buffer (void) const" << be_nl - << "{" << be_idt_nl - << "return ACE_reinterpret_cast(const "; - pt->accept (visitor); - *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "const "; + pt->accept (visitor); + *os << " *get_buffer (void) const;" << be_nl; // replace *os << "void replace (CORBA::ULong max," << be_idt_nl << "CORBA::ULong length," << be_nl; - pt->accept(visitor); *os <<" *data," << be_nl - << "CORBA::Boolean release = 0)" << be_uidt_nl - << "{" << be_idt_nl - << "this->maximum_ = max;" << be_nl - << "this->length_ = length;" << be_nl - << "if (this->buffer_ && this->release_ == 1)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<"* tmp = ACE_reinterpret_cast("; - pt->accept (visitor); *os << "* ACE_CAST_CONST, this->buffer_);" << be_nl - << "freebuf (tmp);" << be_uidt_nl - << "}" << be_nl - << "this->buffer_ = data;" << be_nl - << "this->release_ = release;" << be_uidt_nl - << "}" << be_nl - << be_uidt_nl - << "};" << be_nl; + pt->accept(visitor); + *os <<" *data," << be_nl + << "CORBA::Boolean release = 0);" << be_uidt << be_uidt_nl; + + *os << "};\n"; os->gen_endif (); // endif macro + // generate #endif for AHETI + os->gen_endif_AHETI(); delete visitor; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp new file mode 100644 index 00000000000..6b5248cda52 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_sequence_ci.cpp @@ -0,0 +1,337 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// gen_bounded_sequence_ci.cpp +// +// = DESCRIPTION +// Visitor generating code for Sequence in the client inline +// +// = AUTHOR +// Michael Kircher +// +// Modifications by Aniruddha Gokhale +// +// ============================================================================ + +//#include "idl.h" +//#include "idl_extern.h" +#include "be.h" + +#include "be_visitor_sequence.h" + +ACE_RCSID(be_visitor_sequence, gen_bounded_sequence_ci, "$Id$") + + +int +be_visitor_sequence_ci::gen_bounded_sequence (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + // retrieve the base type since we may need to do some code + // generation for the base type. + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "Bad element type\n"), -1); + } + + // generate the class name + be_type *pt; // base types + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // get the primitive base type of this typedef node + be_typedef *t = be_typedef::narrow_from_decl (bt); + pt = t->primitive_base_type (); + } + else + pt = bt; + + const char * class_name = node->instance_name (); + + static char full_class_name [NAMEBUFSIZE]; + ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (full_class_name, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + class_name); + } + else + { + ACE_OS::sprintf (full_class_name, "%s", + class_name); + } + + + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + + os->gen_ifdef_macro (class_name); + + os->indent (); + + // Constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (void)" << be_nl + << "// Default constructor." << be_nl + << " : TAO_Bounded_Base_Sequence (" << node->max_size () + << ", 0, allocbuf (" << node->max_size () << "), 0)" << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl; + *os << full_class_name << "::" << class_name << " (CORBA::ULong length," << be_idt_nl; + pt->accept (visitor); + *os <<" *data," << be_nl + << "CORBA::Boolean release=0)" << be_uidt_nl + << "// Constructor using the data and memory management flag." << be_nl + << " : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, data, release)" << be_nl + << "{" << be_nl + << " this->_allocate_buffer (" << node->max_size () << ");" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name + << " (const " << full_class_name << " &rhs)" << be_nl + << "// Copy constructor." << be_idt_nl + << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" *tmp1 = allocbuf (" << node->max_size () << ");" << be_nl + << be_nl; + pt->accept(visitor); + *os <<" * const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl + << "tmp1[i] = tmp2[i];" << be_uidt_nl + << be_nl + << "this->buffer_ = tmp1;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator= + *os << "ACE_INLINE " << full_class_name << " &" << be_nl + << full_class_name << "::operator= (const " << full_class_name << " &rhs)" << be_nl + << "// Assignment operator. " << be_nl + << "{" << be_idt_nl + << "if (this == &rhs)" << be_idt_nl + << "return *this;" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_nl + << "{" << be_nl + << "}" << be_nl + << "else" << be_idt_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_nl + << be_nl + <<"TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl + << be_nl; + pt->accept(visitor); + *os <<"* tmp1 = ACE_reinterpret_cast ("; + pt->accept(visitor); + *os << " *, this->buffer_);" << be_nl; + pt->accept(visitor); + *os <<"* const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl + << "tmp1[i] = tmp2[i];" << be_uidt_nl + << be_nl + << "return *this;" << be_uidt_nl << be_uidt_nl + << "}" << be_nl + << be_nl; + + // destructor + *os << "ACE_INLINE " << be_nl + << full_class_name << "::~" << class_name << " (void) // Dtor." << be_nl + << "{" << be_idt_nl + << "this->_deallocate_buffer ();" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // Accessors + *os << "// = Accessors." << be_nl; + *os << "ACE_INLINE "; + pt->accept(visitor); + *os << " &" << be_nl; + *os << full_class_name << "::operator[] (CORBA::ULong i)// operator []" << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (i < this->maximum_);" << be_nl; + pt->accept(visitor); + *os <<" *tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "*,this->buffer_);" << be_nl + << "return tmp[i];" << be_uidt_nl + << "}" << be_nl; + + *os << "ACE_INLINE const "; + pt->accept (visitor); + *os << " &" << be_nl + << full_class_name << "::operator[] (CORBA::ULong i) const// operator []" << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (i < this->maximum_);" << be_nl + << "const "; + pt->accept (visitor); + *os << "* tmp = ACE_reinterpret_cast (const "; + pt->accept (visitor); + *os << "* ACE_CAST_CONST,this->buffer_);" << be_nl + << "return tmp[i];" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // Static Operations + *os << "// = Static operations." << be_nl + << "ACE_INLINE "; + pt->accept (visitor); + *os << " *" << be_nl + << full_class_name << "::allocbuf (CORBA::ULong) " + << "// Allocate storage for the sequence." << be_nl + << "{" << be_idt_nl + << "return new "; + pt->accept (visitor); + *os << "[" << node->max_size () << "];" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // free_buf + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::freebuf ("; + pt->accept (visitor); + *os << " *buffer) // Free the sequence." << be_nl + << "{" << be_idt_nl + << "delete [] buffer;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocate_buffer + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl + << "// allocate a buffer of the requested length. The buffer is allocated for the" << be_nl + << "// right type" << be_nl + << "{" << be_idt_nl + << "this->buffer_ = allocbuf (" << node->max_size () << ");" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // deallocate_buffer + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::_deallocate_buffer (void)" << be_nl + << "// deallocate the buffer" << be_nl + << "{" << be_idt_nl + << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl + << "return;" << be_uidt_nl; + pt->accept(visitor); + *os <<" *tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " *, this->buffer_);" << be_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = 0;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE "; + pt->accept(visitor); + *os << " *" << be_nl + << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os << " *result = 0;" << be_nl + << "if (orphan == 0)" << be_nl + << "{" << be_idt_nl + << "// We retain ownership." << be_nl + << "if (this->buffer_ == 0)" << be_nl + << "{" << be_idt_nl + << "result = allocbuf (this->maximum_);" << be_nl + << "this->buffer_ = result;" << be_uidt_nl + << "}" << be_nl + << "else" << be_nl + << "{" << be_idt_nl + << "result = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "*, this->buffer_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else // if (orphan == 1)" << be_nl + << "{" << be_idt_nl + << "if (this->release_ != 0)" << be_nl + << "{" << be_idt_nl + << "// We set the state back to default and relinquish" << be_nl + << "// ownership." << be_nl + << "result = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "*,this->buffer_);" << be_nl + << "this->maximum_ = 0;" << be_nl + << "this->length_ = 0;" << be_nl + << "this->buffer_ = 0;" << be_nl + << "this->release_ = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "return result;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE const "; + pt->accept (visitor); + *os << " *" << be_nl + << full_class_name << "::get_buffer (void) const" << be_nl + << "{" << be_idt_nl + << "return ACE_reinterpret_cast(const "; + pt->accept (visitor); + *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // replace + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::replace (CORBA::ULong max," << be_idt_nl + << "CORBA::ULong length," << be_nl; + pt->accept(visitor); + *os <<" *data," << be_nl + << "CORBA::Boolean release = 0)" << be_uidt_nl + << "{" << be_idt_nl + << "this->maximum_ = max;" << be_nl + << "this->length_ = length;" << be_nl + << "if (this->buffer_ && this->release_ == 1)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<"* tmp = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "* ACE_CAST_CONST, this->buffer_);" << be_nl + << "freebuf (tmp);" << be_uidt_nl + << "}" << be_nl + << "this->buffer_ = data;" << be_nl + << "this->release_ = release;" << be_uidt_nl + << "}" << be_nl; + + os->gen_endif (); // endif macro + + // generate #endif for AHETI + os->gen_endif_AHETI(); + + delete visitor; + return 0; +} diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp index 73d490821e4..2599c0b94ba 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ch.cpp @@ -16,6 +16,7 @@ // = AUTHOR // Michael Kircher // +// Modifications by Aniruddha Gokhale // ============================================================================ #include "be.h" @@ -63,6 +64,10 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node) ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH); be_visitor *visitor = tao_cg->make_visitor (&ctx); + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + os->gen_ifdef_macro (class_name); os->indent (); @@ -84,189 +89,55 @@ be_visitor_sequence_ch::gen_bounded_str_sequence (be_sequence *node) << "public:" << be_idt_nl; // constructor - *os << class_name << " (void)" << be_nl - << " : TAO_Bounded_Base_Sequence (" << node->max_size () - << ", allocbuf(" << node->max_size () << "))" << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (void);" << be_nl; // constructor *os << class_name << " (CORBA::ULong length," << be_idt_nl << "char* *value," << be_nl - << "CORBA::Boolean release = 0)" << be_uidt_nl - << " : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl - << "{" << be_nl - << " this->_allocate_buffer (" << node->max_size () << ");" << be_nl - << "}" << be_nl - << be_nl; + << "CORBA::Boolean release = 0);" << be_uidt_nl; // constructor - *os << class_name << " (const " << class_name << " &rhs)" << be_idt_nl - << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl - << "{" << be_idt_nl - << "char **tmp1 = allocbuf (this->maximum_);" << be_nl - << "char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i=0; i < rhs.length_; i++)" << be_idt_nl - << "tmp1[i] = CORBA::string_dup (tmp2[i]);" << be_uidt_nl - << be_nl - << "this->buffer_ = tmp1;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (const " << class_name << " &rhs);" << be_nl; // operator= - *os << class_name << " &operator= (const " << class_name << " &rhs)" << be_nl - << "{" << be_idt_nl - << "if (this == &rhs)" << be_idt_nl - << "return *this;" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_nl - << "{ " << be_idt_nl - << "char **tmp = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::string_free (tmp[i]);" << be_nl - << "tmp[i] = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else" << be_idt_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << be_nl - << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl - << be_nl - << "char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl - << "char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl - << "tmp1[i] = CORBA::string_dup (tmp2[i]);" << be_uidt_nl - << "return *this;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " &operator= (const " << class_name << " &rhs);" << be_nl; // destructor - *os << "~" << class_name << " (void)" << be_nl - << "{" << be_idt_nl - << "this->_deallocate_buffer ();" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "~" << class_name << " (void);" << be_nl; // operator[] - *os << "TAO_String_Manager operator[] (CORBA::ULong index) const" << be_nl - << "// read-write accessor" << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (index < this->maximum_);" << be_nl - << "char **const tmp = ACE_reinterpret_cast (char ** ACE_CAST_CONST, this->buffer_);" << be_nl - << "return TAO_String_Manager (tmp + index, this->release_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "TAO_String_Manager operator[] (CORBA::ULong index) const;" << be_nl + << "// read-write accessor" << be_nl; // allocbuf - *os << "static char **allocbuf (CORBA::ULong length)" << be_nl - << "{" << be_idt_nl - << "char **buf;" << be_nl - << "ACE_NEW_RETURN (buf, char *[" << node->max_size () << "], 0);" << be_nl - << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl - << "buf[i] = 0;" << be_uidt_nl - << "return buf;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "static char **allocbuf (CORBA::ULong length);" << be_nl; // freebuf - *os << "static void freebuf (char **buffer)" << be_nl - << "{" << be_idt_nl - << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" << be_nl - << "{" << be_idt_nl - << "if (buffer[i] != 0)" << be_nl - << "{" << be_idt_nl - << "CORBA::string_free (buffer[i]);" << be_nl - << "buffer[i] = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "delete [] buffer;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "static void freebuf (char **buffer);" << be_nl; // allocate_buffer - *os << "virtual void _allocate_buffer (CORBA::ULong length)" << be_nl - << "{" << be_idt_nl - << "// For this class memory is never reallocated so the implementation" << be_nl - << "// is *really* simple." << be_nl - << "this->buffer_ = allocbuf (" << node->max_size () << ");" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl; // deallocate_buffer - *os << "virtual void _deallocate_buffer (void)" << be_nl - << "{" << be_idt_nl - << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl - << "return;" << be_uidt_nl - << "char **tmp = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = 0;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _deallocate_buffer (void);" << be_nl; // get_buffer - *os << "char* *get_buffer (CORBA::Boolean orphan = 0)" << be_nl - << "{" << be_idt_nl - << "char **result = 0;" << be_nl - << "if (orphan == 0)" << be_nl - << "{" << be_idt_nl - << "// We retain ownership. " << be_nl - << "if (this->buffer_ == 0)" << be_nl - << "{" << be_idt_nl - << "result = allocbuf (this->maximum_);" << be_nl - << "this->buffer_ = result;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "result = ACE_reinterpret_cast (char **, this->buffer_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else // if (orphan == 1)" << be_nl - << "{" << be_idt_nl - << "if (this->release_ != 0)" << be_nl - << "{" << be_idt_nl - << "// We set state back to default and relinquish" << be_nl - << "// ownership." << be_nl - << "result = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl - << "this->maximum_ = 0;" << be_nl - << "this->length_ = 0;" << be_nl - << "this->buffer_ = 0;" << be_nl - << "this->release_ = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "return result;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "char* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl; // get_buffer - *os << "const char* *get_buffer (void) const" << be_nl - << "{" << be_idt_nl - << "return ACE_reinterpret_cast (const char ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "const char* *get_buffer (void) const;" << be_nl; // shrink_buffer - *os << "virtual void _shrink_buffer (CORBA::ULong nl,CORBA::ULong ol)" << be_nl - << "{" << be_idt_nl - << "char **tmp = ACE_reinterpret_cast (char **,this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::string_free (tmp[i]);" << be_nl - << "tmp[i] = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << be_uidt_nl - << "};" << be_nl; - + *os << "virtual void _shrink_buffer (CORBA::ULong nl,CORBA::ULong ol);" + << be_uidt_nl; + *os << "};\n"; os->gen_endif (); // endif macro + // generate #endif for AHETI + os->gen_endif_AHETI(); + delete visitor; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp new file mode 100644 index 00000000000..28357669207 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_bounded_str_sequence_ci.cpp @@ -0,0 +1,303 @@ +// +// $Id$ +// + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// gen_bounded_str_sequence_ci.cpp +// +// = DESCRIPTION +// Visitor generating code for Sequence in the client inline +// +// = AUTHOR +// Michael Kircher +// +// Modifications by Aniruddha Gokhale +// +// ============================================================================ + +#include "be.h" + +#include "be_visitor_sequence.h" + +ACE_RCSID(be_visitor_sequence, gen_bounded_str_sequence_ci, "$Id$") + + +int +be_visitor_sequence_ci::gen_bounded_str_sequence (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + // retrieve the base type since we may need to do some code + // generation for the base type. + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "Bad element type\n"), -1); + } + + // generate the class name + be_type *pt; // base types + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // get the primitive base type of this typedef node + be_typedef *t = be_typedef::narrow_from_decl (bt); + pt = t->primitive_base_type (); + } + else + pt = bt; + + + const char * class_name = node->instance_name (); + + static char full_class_name [NAMEBUFSIZE]; + ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (full_class_name, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + class_name); + } + else + { + ACE_OS::sprintf (full_class_name, "%s", + class_name); + } + + + // get the visitor for the type of the sequence + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + + os->gen_ifdef_macro (class_name); + + os->indent (); + // the accept is here the first time used and if an + // error occurs, it will occur here. Later no check + // for errors will be done. + if (pt->accept (visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "base type visit failed\n"), + -1); + } + + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (void)" << be_nl + << " : TAO_Bounded_Base_Sequence (" << node->max_size () + << ", allocbuf(" << node->max_size () << "))" << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (CORBA::ULong length," << be_idt_nl + << "char* *value," << be_nl + << "CORBA::Boolean release = 0)" << be_uidt_nl + << " : TAO_Bounded_Base_Sequence (" << node->max_size () << ", length, value, release)" << be_nl + << "{" << be_nl + << " this->_allocate_buffer (" << node->max_size () << ");" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (const " << full_class_name << " &rhs)" << be_idt_nl + << ": TAO_Bounded_Base_Sequence (rhs)" << be_uidt_nl + << "{" << be_idt_nl + << "char **tmp1 = allocbuf (this->maximum_);" << be_nl + << "char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i=0; i < rhs.length_; i++)" << be_idt_nl + << "tmp1[i] = CORBA::string_dup (tmp2[i]);" << be_uidt_nl + << be_nl + << "this->buffer_ = tmp1;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator= + *os << "ACE_INLINE " << full_class_name << "& " << be_nl + << full_class_name << "::operator= (const " << full_class_name << " &rhs)" << be_nl + << "{" << be_idt_nl + << "if (this == &rhs)" << be_idt_nl + << "return *this;" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_nl + << "{ " << be_idt_nl + << "char **tmp = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::string_free (tmp[i]);" << be_nl + << "tmp[i] = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else" << be_idt_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << be_nl + << "TAO_Bounded_Base_Sequence::operator= (rhs);" << be_nl + << be_nl + << "char **tmp1 = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl + << "char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < rhs.length_; i++)" << be_idt_nl + << "tmp1[i] = CORBA::string_dup (tmp2[i]);" << be_uidt_nl + << "return *this;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // destructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::~" << class_name << " (void)" << be_nl + << "{" << be_idt_nl + << "this->_deallocate_buffer ();" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator[] + *os << "ACE_INLINE TAO_String_Manager " << be_nl + << full_class_name << "::operator[] (CORBA::ULong index) const" << be_nl + << "// read-write accessor" << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (index < this->maximum_);" << be_nl + << "char **const tmp = ACE_reinterpret_cast (char ** ACE_CAST_CONST, this->buffer_);" << be_nl + << "return TAO_String_Manager (tmp + index, this->release_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocbuf + *os << "ACE_INLINE char **" << be_nl + << full_class_name << "::allocbuf (CORBA::ULong length)" << be_nl + << "{" << be_idt_nl + << "char **buf;" << be_nl + << "ACE_NEW_RETURN (buf, char *[" << node->max_size () << "], 0);" << be_nl + << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; i++)" << be_idt_nl + << "buf[i] = 0;" << be_uidt_nl + << "return buf;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // freebuf + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::freebuf (char **buffer)" << be_nl + << "{" << be_idt_nl + << "for (CORBA::ULong i = 0; i < " << node->max_size () << "; ++i)" << be_nl + << "{" << be_idt_nl + << "if (buffer[i] != 0)" << be_nl + << "{" << be_idt_nl + << "CORBA::string_free (buffer[i]);" << be_nl + << "buffer[i] = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "delete [] buffer;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocate_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl + << "{" << be_idt_nl + << "// For this class memory is never reallocated so the implementation" << be_nl + << "// is *really* simple." << be_nl + << "this->buffer_ = allocbuf (" << node->max_size () << ");" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // deallocate_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_deallocate_buffer (void)" << be_nl + << "{" << be_idt_nl + << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl + << "return;" << be_uidt_nl + << "char **tmp = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = 0;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE char**" << be_nl + << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl + << "{" << be_idt_nl + << "char **result = 0;" << be_nl + << "if (orphan == 0)" << be_nl + << "{" << be_idt_nl + << "// We retain ownership. " << be_nl + << "if (this->buffer_ == 0)" << be_nl + << "{" << be_idt_nl + << "result = allocbuf (this->maximum_);" << be_nl + << "this->buffer_ = result;" << be_uidt_nl + << "}" << be_nl + << "else" << be_nl + << "{" << be_idt_nl + << "result = ACE_reinterpret_cast (char **, this->buffer_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else // if (orphan == 1)" << be_nl + << "{" << be_idt_nl + << "if (this->release_ != 0)" << be_nl + << "{" << be_idt_nl + << "// We set state back to default and relinquish" << be_nl + << "// ownership." << be_nl + << "result = ACE_reinterpret_cast (char **, this->buffer_);" << be_nl + << "this->maximum_ = 0;" << be_nl + << "this->length_ = 0;" << be_nl + << "this->buffer_ = 0;" << be_nl + << "this->release_ = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "return result;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE const char**" << be_nl + << full_class_name << "::get_buffer (void) const" << be_nl + << "{" << be_idt_nl + << "return ACE_reinterpret_cast (const char ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // shrink_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl + << "{" << be_idt_nl + << "char **tmp = ACE_reinterpret_cast (char **,this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::string_free (tmp[i]);" << be_nl + << "tmp[i] = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl; + + os->gen_endif (); // endif macro + + // generate #endif for AHETI + os->gen_endif_AHETI(); + + + delete visitor; + return 0; +} + diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp index 0efb9aece41..79ebbf95882 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ch.cpp @@ -16,9 +16,10 @@ // = AUTHOR // Michael Kircher // +// Modifications by Aniruddha Gokhale +// // ============================================================================ - #include "be.h" #include "be_visitor_sequence.h" @@ -66,6 +67,10 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node) const char * object_manager = node->object_manager_name (); // create the name for the object manager + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + os->gen_ifdef_macro (object_manager); os->indent (); @@ -78,12 +83,7 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node) // constructor *os << "// = Initialization and termination methods." << be_nl - << object_manager << " (const " << object_manager << " &rhs)" << be_idt_nl - << ": ptr_ (rhs.ptr_)," << be_nl - << "release_ (rhs.release_)" << be_uidt_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + << object_manager << " (const " << object_manager << " &rhs);" << be_nl; // constructor *os << object_manager << " ("; @@ -98,121 +98,62 @@ be_visitor_sequence_ch::gen_object_manager (be_sequence *node) "base type visit failed\n"), -1); } - *os << "** buffer, CORBA::Boolean release)" << be_idt_nl - << ": ptr_ (buffer)," << be_nl - << "release_ (release)" << be_uidt_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << "** buffer, CORBA::Boolean release);" << be_nl; // destructor - *os << "~" << object_manager << " (void)" << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << "~" << object_manager << " (void);" << be_nl; // operator= - *os << object_manager << " &operator= (const " << object_manager << " &rhs)" << be_nl - << "{" << be_idt_nl - << "if (this == &rhs)" << be_idt_nl - << "return *this;" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (*this->ptr_);" << be_nl - << "*this->ptr_ = "; pt->accept (visitor); *os << "::_duplicate (*rhs.ptr_);" << be_uidt_nl - << "}" << be_nl - << "else" << be_idt_nl - << "*this->ptr_ = *rhs.ptr_;" << be_uidt_nl - << be_nl - << "return *this;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << object_manager << " &operator= (const " << object_manager << " &rhs);" << be_nl; // operator= - *os << object_manager << " &operator= ("; pt->accept (visitor); *os << " *p)" << be_nl - << "// Assignment from "; pt->accept (visitor); *os << " *." << be_nl - << "{" << be_idt_nl - << "if (this->release_)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (*this->ptr_);" << be_nl - << "*this->ptr_ = p;" << be_uidt_nl - << "}" << be_nl - << "else" << be_idt_nl - << "*this->ptr_ = p;" << be_uidt_nl - << be_nl - << "return *this;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << object_manager << " &operator= ("; + pt->accept (visitor); + *os << " *p);" << be_nl; // cast operator - *os << "operator const "; pt->accept (visitor); *os << " *() const // Cast (read-only)." << be_nl - << "{" << be_idt_nl - << "return *this->ptr_;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "operator const "; + pt->accept (visitor); + *os << " *() const; // Cast (read-only)." << be_nl; // cast operator - *os << "operator "; pt->accept (visitor); *os << " *&() // Cast." << be_nl - << "{" << be_idt_nl - << "return *this->ptr_;" << be_uidt_nl - << "}" << be_nl - << be_nl; - + *os << "operator "; + pt->accept (visitor); + *os << " *&(); // Cast." << be_nl; + // in method - *os << "const "; pt->accept (visitor); *os << " *in (void) const // in " - << be_nl - << "{" << be_idt_nl - << "return *this->ptr_;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "const "; + pt->accept (visitor); + *os << " *in (void) const; // in " << be_nl; // inout method pt->accept (visitor); - *os << " *&inout (void) // inout " - << be_nl - << "{" << be_idt_nl - << "return *this->ptr_;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << " *&inout (void); // inout " << be_nl; // out method pt->accept (visitor); - *os << " *&out (void) // out " - << be_nl - << "{" << be_idt_nl - << "CORBA::release (*this->ptr_);" << be_nl - << "*this->ptr_ = "; pt->accept (visitor); *os << "::_nil ();" - << be_nl - << "return *this->ptr_;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << " *&out (void); // out " << be_nl; // retn method pt->accept (visitor); - *os << " *_retn (void) // retn " - << be_nl - << "{" << be_idt_nl; - pt->accept (visitor); - *os << " *temp = *this->ptr_;" << be_nl - << "*this->ptr_ = "; pt->accept (visitor); *os << "::_nil ();" - << be_nl - << "return temp;" << be_uidt_nl - << "}" << be_nl - << be_uidt_nl; + *os << " *_retn (void); // retn " << be_uidt_nl; // members *os << "private:" << be_idt_nl; - pt->accept(visitor); *os <<" **ptr_;" << be_nl + pt->accept(visitor); + *os <<" **ptr_;" << be_nl << "// data member, notice that it is a pointer, to implement the" << be_nl << "// reference behavior for assignment." << be_nl << be_nl << "CORBA::Boolean release_;" << be_nl << "// release flag based on parent's flag" << be_uidt_nl << "};" << be_nl; - + os->gen_endif (); // endif macro + // generate #endif for AHETI + os->gen_endif_AHETI(); + delete visitor; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp new file mode 100644 index 00000000000..f43ba6ff639 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_object_manager_ci.cpp @@ -0,0 +1,259 @@ +// +// $Id$ +// + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// gen_object_manager_ci.cpp +// +// = DESCRIPTION +// Visitor generating code for Sequence in the client inline +// +// = AUTHOR +// Michael Kircher +// +// Modifications by Aniruddha Gokhale +// +// ============================================================================ + +#include "be.h" + +#include "be_visitor_sequence.h" + +ACE_RCSID(be_visitor_sequence, gen_object_manager_ci, "$Id$") + + +int +be_visitor_sequence_ci::gen_object_manager (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + // retrieve the base type since we may need to do some code + // generation for the base type. + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "Bad element type\n"), -1); + } + + // generate the class name + // we might want to use this later + be_type *pt; // base types + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // get the primitive base type of this typedef node + be_typedef *t = be_typedef::narrow_from_decl (bt); + pt = t->primitive_base_type (); + } + else + pt = bt; + + + const char * class_name = node->instance_name (); + + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + + const char * object_manager = node->object_manager_name (); + + static char full_object_manager [NAMEBUFSIZE]; + ACE_OS::memset (full_object_manager, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (full_object_manager, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + object_manager); + } + else + { + ACE_OS::sprintf (full_object_manager, "%s", + object_manager); + } + + // create the name for the object manager + + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + + os->gen_ifdef_macro (object_manager); + + os->indent (); + + // constructor + *os << "// = Initialization and termination methods." << be_nl + << "ACE_INLINE" << be_nl + << full_object_manager << "::" << object_manager << " (const " + << full_object_manager << " &rhs)" << be_idt_nl + << ": ptr_ (rhs.ptr_)," << be_nl + << "release_ (rhs.release_)" << be_uidt_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_object_manager << "::" << object_manager << " ("; + // the accept is here the first time used and if an + // error occurs, it will occur here. Later no check + // for errors will be done. + if (pt->accept (visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "base type visit failed\n"), + -1); + } + *os << "** buffer, CORBA::Boolean release)" << be_idt_nl + << ": ptr_ (buffer)," << be_nl + << "release_ (release)" << be_uidt_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // destructor + *os << "ACE_INLINE" << be_nl + << full_object_manager << "::~" << object_manager << " (void)" << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // operator= + *os << "ACE_INLINE " << full_object_manager << " &" << be_nl + << full_object_manager << "::operator= (const " << full_object_manager + << " &rhs)" << be_nl + << "{" << be_idt_nl + << "if (this == &rhs)" << be_idt_nl + << "return *this;" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (*this->ptr_);" << be_nl + << "*this->ptr_ = "; + pt->accept (visitor); + *os << "::_duplicate (*rhs.ptr_);" << be_uidt_nl + << "}" << be_nl + << "else" << be_idt_nl + << "*this->ptr_ = *rhs.ptr_;" << be_uidt_nl + << be_nl + << "return *this;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator= + *os << "ACE_INLINE " << full_object_manager << " &" << be_nl + << full_object_manager << "::operator= ("; + pt->accept (visitor); + *os << " *p)" << be_nl + << "// Assignment from "; + pt->accept (visitor); + *os << " *." << be_nl + << "{" << be_idt_nl + << "if (this->release_)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (*this->ptr_);" << be_nl + << "*this->ptr_ = p;" << be_uidt_nl + << "}" << be_nl + << "else" << be_idt_nl + << "*this->ptr_ = p;" << be_uidt_nl + << be_nl + << "return *this;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // cast operator + *os << "ACE_INLINE " << be_nl + << full_object_manager << "::operator const "; + pt->accept (visitor); + *os << " *() const // Cast (read-only)." << be_nl + << "{" << be_idt_nl + << "return *this->ptr_;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // cast operator + *os << "ACE_INLINE" << be_nl + << full_object_manager << "::operator "; + pt->accept (visitor); + *os << " *&() // Cast." << be_nl + << "{" << be_idt_nl + << "return *this->ptr_;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // in method + *os << "ACE_INLINE const "; + pt->accept (visitor); + *os << " *" << be_nl + << full_object_manager << "::in (void) const // in " + << be_nl + << "{" << be_idt_nl + << "return *this->ptr_;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // inout method + *os << "ACE_INLINE "; + pt->accept (visitor); + *os << " *&" << be_nl + << full_object_manager << "::inout (void) // inout " + << be_nl + << "{" << be_idt_nl + << "return *this->ptr_;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // out method + *os << "ACE_INLINE "; + pt->accept (visitor); + *os << " *&" << be_nl + << full_object_manager << "::out (void) // out " + << be_nl + << "{" << be_idt_nl + << "CORBA::release (*this->ptr_);" << be_nl + << "*this->ptr_ = "; + pt->accept (visitor); + *os << "::_nil ();" + << be_nl + << "return *this->ptr_;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // retn method + *os << "ACE_INLINE "; + pt->accept (visitor); + *os << " *" << be_nl + << full_object_manager << "::_retn (void) // retn " + << be_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os << " *temp = *this->ptr_;" << be_nl + << "*this->ptr_ = "; + pt->accept (visitor); + *os << "::_nil ();" + << be_nl + << "return temp;" << be_uidt_nl + << "}" << be_nl; + + + os->gen_endif (); // endif macro + + // generate #endif for AHETI + os->gen_endif_AHETI(); + + delete visitor; + return 0; +} + diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp index f4392a9c675..960bf4b63f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ch.cpp @@ -16,6 +16,8 @@ // = AUTHOR // Michael Kircher // +// Modifications by Aniruddha Gokhale +// // ============================================================================ @@ -66,6 +68,10 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node) const char * object_manager = node->object_manager_name (); + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + os->gen_ifdef_macro (class_name); os->indent (); @@ -77,221 +83,58 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node) << be_nl; // constructor - *os << class_name << " (void)" << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (void);" << be_nl; // constructor - *os << class_name << " (CORBA::ULong maximum)" << be_idt_nl - << ": TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))" << be_uidt_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (CORBA::ULong maximum);" << be_nl; // constructor *os << class_name << " (CORBA::ULong maximum," << be_idt_nl << "CORBA::ULong length," << be_nl; pt->accept (visitor); *os <<"* *value," << be_nl - << "CORBA::Boolean release=0)" << be_uidt_nl - << ": TAO_Unbounded_Base_Sequence (maximum, length, value, release)" << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + << "CORBA::Boolean release = 0);" << be_uidt_nl; // constructor - *os << class_name << "(const " << class_name << " &rhs)" << be_idt_nl - << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **tmp1 = allocbuf (this->maximum_);" << be_nl; - pt->accept(visitor); *os <<" ** const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl - << "tmp1[i] = "; pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl - << be_nl - << "this->buffer_ = tmp1;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << "(const " << class_name << " &rhs);" << be_nl; // destructor - *os << "~" << class_name << " (void)" << be_nl - << "{" << be_idt_nl - << "this->_deallocate_buffer ();" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "~" << class_name << " (void);" << be_nl; // operator= - *os << class_name << " &operator= (const " << class_name << " &rhs)" << be_nl - << "{" << be_idt_nl - << "if (this == &rhs)" << be_idt_nl - << "return *this;" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " **, this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (tmp[i]);" << be_nl - << "tmp[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << "}" << be_nl - << "if (this->maximum_ < rhs.maximum_)" << be_nl - << "{" << be_idt_nl - << class_name << "::freebuf (tmp);" << be_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else" << be_idt_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << be_nl - << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl - << be_nl; - pt->accept(visitor); *os <<" **tmp1 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " **, this->buffer_);" << be_nl; - pt->accept(visitor); *os <<" ** const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl - << "tmp1[i] = "; pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl - << be_nl - << "return *this;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " &operator= (const " << class_name << " &rhs);" << be_nl; // operator[] - *os << object_manager << " operator[] (CORBA::ULong index) const" << be_nl - << "// read-write accessor" << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (index < this->maximum_);" << be_nl; - pt->accept(visitor); *os <<" ** const tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl - << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << object_manager << " operator[] (CORBA::ULong index) const;" << be_nl; // allocbuf - *os << "static "; pt->accept (visitor); *os << " **allocbuf (CORBA::ULong nelems)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **buf;" << be_nl - << be_nl - << "ACE_NEW_RETURN (buf, "; pt->accept (visitor); *os << "*[nelems], 0);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < nelems; i++)" << be_idt_nl - << "buf[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << be_nl - << "return buf;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "static "; + pt->accept (visitor); + *os << " **allocbuf (CORBA::ULong nelems);" << be_nl; // freebuf - *os << "static void freebuf ("; pt->accept (visitor); *os << " **buffer)" << be_nl - << "{" << be_idt_nl - << "if (buffer == 0)" << be_idt_nl - << "return;" << be_uidt_nl - << "delete[] buffer;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "static void freebuf ("; + pt->accept (visitor); + *os << " **buffer);" << be_nl; // allocate_buffer *os << "// The Base_Sequence functions, please see tao/Sequence.h" << be_nl - << "virtual void _allocate_buffer (CORBA::ULong length)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **tmp = allocbuf (length);" << be_nl - << be_nl - << "if (this->buffer_ != 0)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **old = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << "**, this->buffer_);" << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl - << "if (!this->release_)" << be_idt_nl - << "tmp[i] = "; pt->accept (visitor); *os << "::_duplicate (old[i]);" << be_uidt_nl - << "else" << be_idt_nl - << "tmp[i] = old[i];" << be_uidt_nl << be_uidt_nl - << "if (this->release_)" << be_idt_nl - << "delete[] old;" << be_uidt_nl << be_uidt_nl - << "}" << be_nl - << "this->buffer_ = tmp;" << be_uidt_nl - << "}" << be_nl - << be_nl; + << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl; // deallocate_buffer - *os << "virtual void _deallocate_buffer (void)" << be_nl - << "{" << be_idt_nl - << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl - << "return;" << be_uidt_nl; - pt->accept(visitor); *os <<" **tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << "**, this->buffer_);" << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (tmp[i]);" << be_nl - << "tmp[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << "}" << be_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = 0;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _deallocate_buffer (void);" << be_nl; // get_buffer - pt->accept(visitor); *os << "* *get_buffer (CORBA::Boolean orphan = 0)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os << " **result = 0;" << be_nl - << "if (orphan == 0)" << be_nl - << "{" << be_idt_nl - << "// We retain ownership." << be_nl - << "if (this->buffer_ == 0)" << be_nl - << "{" << be_idt_nl - << "result = allocbuf (this->maximum_);" << be_nl - << "this->buffer_ = result;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "result = ACE_reinterpret_cast ("; - pt->accept (visitor); - *os << "**, this->buffer_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else // if (orphan == 1)" << be_nl - << "{" << be_idt_nl - << "if (this->release_ != 0)" << be_nl - << "{" << be_idt_nl - << "// We set the state back to default and relinquish" << be_nl - << "// ownership." << be_nl - << "result = ACE_reinterpret_cast("; pt->accept (visitor); *os << "**,this->buffer_);" << be_nl - << "this->maximum_ = 0;" << be_nl - << "this->length_ = 0;" << be_nl - << "this->buffer_ = 0;" << be_nl - << "this->release_ = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "return result;" << be_uidt_nl - << "}" << be_nl - << be_nl; + pt->accept(visitor); + *os << "* *get_buffer (CORBA::Boolean orphan = 0);" << be_nl; // get_buffer - *os << "const "; pt->accept (visitor); *os << "* *get_buffer (void) const" << be_nl - << "{" << be_idt_nl - << "return ACE_reinterpret_cast(const "; - pt->accept (visitor); - *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "const "; + pt->accept (visitor); + *os << "* *get_buffer (void) const;" << be_nl; // shrink_buffer - *os << "virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" **tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << "**, this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl - << "{" << be_idt_nl - << "CORBA::release (tmp[i]);" << be_nl - << "tmp[i] = "; pt->accept (visitor); *os << "::_nil ();" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl; - + *os << "virtual void _shrink_buffer (CORBA::ULong nl, CORBA::ULong ol);" << be_nl; be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt); if ((pt->node_type () != AST_Decl::NT_pre_defined) || @@ -305,30 +148,16 @@ be_visitor_sequence_ch::gen_unbounded_obj_sequence (be_sequence *node) << "CORBA_Environment &_env = " << be_idt_nl << "CORBA::Environment::default_environment ()" << be_uidt << be_uidt_nl - << ")" << be_uidt_nl - << "{" << be_idt_nl; - pt->accept (visitor); - *os << " **tmp = ACE_static_cast ("; - pt->accept (visitor); - *os << "**, target);" << be_nl - << "*tmp = "; - pt->accept (visitor); - *os << "::_narrow (src, _env);" << be_uidt_nl - << "}\n" << be_nl; - - *os << "virtual CORBA_Object* _upcast (void *src) const" << be_nl - << "{" << be_idt_nl; - pt->accept (visitor); - *os << " **tmp = ACE_static_cast ("; - pt->accept (visitor); - *os << "**, src);" << be_nl - << "return *tmp;" << be_uidt_nl - << "}" << be_nl; + << ");" << be_uidt_nl; + + *os << "virtual CORBA_Object* _upcast (void *src) const;" << be_nl; } *os << be_uidt_nl << "};\n"; os->gen_endif (); // endif macro + // generate #endif for AHETI + os->gen_endif_AHETI(); delete visitor; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp new file mode 100644 index 00000000000..1589eac2243 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_obj_sequence_ci.cpp @@ -0,0 +1,427 @@ +// +// $Id$ +// + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// gen_unbounded_obj_sequence_ci.cpp +// +// = DESCRIPTION +// Visitor generating code for Sequence in the client inline. +// +// = AUTHOR +// Michael Kircher +// +// Modifications by Aniruddha Gokhale +// +// ============================================================================ + + +#include "be.h" + +#include "be_visitor_sequence.h" + +ACE_RCSID(be_visitor_sequence, gen_unbounded_obj_sequence_ci, "$Id$") + + +int +be_visitor_sequence_ci::gen_unbounded_obj_sequence (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + // retrieve the base type since we may need to do some code + // generation for the base type. + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "Bad element type\n"), -1); + } + + // generate the class name + be_type *pt; // base types + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // get the primitive base type of this typedef node + be_typedef *t = be_typedef::narrow_from_decl (bt); + pt = t->primitive_base_type (); + } + else + pt = bt; + + + const char * class_name = node->instance_name (); + + static char full_class_name [NAMEBUFSIZE]; + ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (full_class_name, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + class_name); + } + else + { + ACE_OS::sprintf (full_class_name, "%s", + class_name); + } + + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + + this->gen_object_manager (node); + + static char object_manager [NAMEBUFSIZE]; + ACE_OS::memset (object_manager, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (object_manager, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + node->object_manager_name ()); + } + else + { + ACE_OS::sprintf (object_manager, "%s", + node->object_manager_name ()); + } + + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + + os->gen_ifdef_macro (class_name); + + os->indent (); + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (void)" << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (CORBA::ULong maximum)" << be_idt_nl + << ": TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))" << be_uidt_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (CORBA::ULong maximum," << be_idt_nl + << "CORBA::ULong length," << be_nl; + pt->accept (visitor); + *os <<"* *value," << be_nl + << "CORBA::Boolean release=0)" << be_uidt_nl + << ": TAO_Unbounded_Base_Sequence (maximum, length, value, release)" << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << "(const " + << full_class_name << " &rhs)" << be_idt_nl + << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp1 = allocbuf (this->maximum_);" << be_nl; + pt->accept(visitor); + *os <<" ** const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl + << "tmp1[i] = "; + pt->accept (visitor); *os << "::_duplicate (tmp2[i]);" << be_uidt_nl + << be_nl + << "this->buffer_ = tmp1;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // destructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::~" << class_name << " (void)" << be_nl + << "{" << be_idt_nl + << "this->_deallocate_buffer ();" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator= + *os << "ACE_INLINE " << full_class_name << " &" << be_nl + << full_class_name << "::operator= (const " << full_class_name << " &rhs)" << be_nl + << "{" << be_idt_nl + << "if (this == &rhs)" << be_idt_nl + << "return *this;" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " **, this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (tmp[i]);" << be_nl + << "tmp[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << "}" << be_nl + << "if (this->maximum_ < rhs.maximum_)" << be_nl + << "{" << be_idt_nl + << full_class_name << "::freebuf (tmp);" << be_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else" << be_idt_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << be_nl + << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl + << be_nl; + pt->accept(visitor); + *os <<" **tmp1 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " **, this->buffer_);" << be_nl; + pt->accept(visitor); + *os <<" ** const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < rhs.length_; ++i)" << be_idt_nl + << "tmp1[i] = "; + pt->accept (visitor); + *os << "::_duplicate (tmp2[i]);" << be_uidt_nl + << be_nl + << "return *this;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator[] + *os << "ACE_INLINE " << object_manager << be_nl + << full_class_name << "::operator[] (CORBA::ULong index) const" << be_nl + << "// read-write accessor" << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (index < this->maximum_);" << be_nl; + pt->accept(visitor); + *os <<" ** const tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, this->buffer_);" << be_nl + << "return " << object_manager << " (tmp + index, this->release_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocbuf + *os << "ACE_INLINE "; + pt->accept (visitor); + *os << " **" << be_nl + << full_class_name << "::allocbuf (CORBA::ULong nelems)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **buf;" << be_nl + << be_nl + << "ACE_NEW_RETURN (buf, "; + pt->accept (visitor); + *os << "*[nelems], 0);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < nelems; i++)" << be_idt_nl + << "buf[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << be_nl + << "return buf;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // freebuf + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::freebuf ("; + pt->accept (visitor); + *os << " **buffer)" << be_nl + << "{" << be_idt_nl + << "if (buffer == 0)" << be_idt_nl + << "return;" << be_uidt_nl + << "delete[] buffer;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocate_buffer + *os << "// The Base_Sequence functions, please see tao/Sequence.h" << be_nl + << "ACE_INLINE void" << be_nl + << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp = allocbuf (length);" << be_nl + << be_nl + << "if (this->buffer_ != 0)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **old = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "**, this->buffer_);" << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl + << "if (!this->release_)" << be_idt_nl + << "tmp[i] = "; + pt->accept (visitor); + *os << "::_duplicate (old[i]);" << be_uidt_nl + << "else" << be_idt_nl + << "tmp[i] = old[i];" << be_uidt_nl << be_uidt_nl + << "if (this->release_)" << be_idt_nl + << "delete[] old;" << be_uidt_nl << be_uidt_nl + << "}" << be_nl + << "this->buffer_ = tmp;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // deallocate_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_deallocate_buffer (void)" << be_nl + << "{" << be_idt_nl + << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl + << "return;" << be_uidt_nl; + pt->accept(visitor); + *os <<" **tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "**, this->buffer_);" << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (tmp[i]);" << be_nl + << "tmp[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << "}" << be_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = 0;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE "; + pt->accept(visitor); + *os << "* *" << be_nl + << full_class_name << "::get_buffer (CORBA::Boolean orphan)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os << " **result = 0;" << be_nl + << "if (orphan == 0)" << be_nl + << "{" << be_idt_nl + << "// We retain ownership." << be_nl + << "if (this->buffer_ == 0)" << be_nl + << "{" << be_idt_nl + << "result = allocbuf (this->maximum_);" << be_nl + << "this->buffer_ = result;" << be_uidt_nl + << "}" << be_nl + << "else" << be_nl + << "{" << be_idt_nl + << "result = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "**, this->buffer_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else // if (orphan == 1)" << be_nl + << "{" << be_idt_nl + << "if (this->release_ != 0)" << be_nl + << "{" << be_idt_nl + << "// We set the state back to default and relinquish" << be_nl + << "// ownership." << be_nl + << "result = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "**,this->buffer_);" << be_nl + << "this->maximum_ = 0;" << be_nl + << "this->length_ = 0;" << be_nl + << "this->buffer_ = 0;" << be_nl + << "this->release_ = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "return result;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE "; + *os << "const "; + pt->accept (visitor); + *os << "* *" << be_nl + << full_class_name << "::get_buffer (void) const" << be_nl + << "{" << be_idt_nl + << "return ACE_reinterpret_cast(const "; + pt->accept (visitor); + *os << " ** ACE_CAST_CONST, this->buffer_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // shrink_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_shrink_buffer (CORBA::ULong nl, CORBA::ULong ol)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" **tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "**, this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = nl; i < ol; ++i)" << be_nl + << "{" << be_idt_nl + << "CORBA::release (tmp[i]);" << be_nl + << "tmp[i] = "; + pt->accept (visitor); + *os << "::_nil ();" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl; + + + be_predefined_type *prim = be_predefined_type::narrow_from_decl (pt); + if ((pt->node_type () != AST_Decl::NT_pre_defined) || + (prim && (prim->pt () == AST_PredefinedType::PT_pseudo) && + (!ACE_OS::strcmp (prim->local_name ()->get_string (), "Object")))) + { + // Pseudo objects do not require this methods. + *os << "ACE_INLINE void " << be_nl + << full_class_name << "::_downcast (" << be_idt << be_idt_nl + << "void* target," << be_nl + << "CORBA_Object *src," << be_nl + << "CORBA_Environment &_env" + << be_uidt_nl + << ")" << be_uidt_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os << " **tmp = ACE_static_cast ("; + pt->accept (visitor); + *os << "**, target);" << be_nl + << "*tmp = "; + pt->accept (visitor); + *os << "::_narrow (src, _env);" << be_uidt_nl + << "}\n" << be_nl; + + *os << "ACE_INLINE CORBA_Object*" << be_nl + << full_class_name << "::_upcast (void *src) const" << be_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os << " **tmp = ACE_static_cast ("; + pt->accept (visitor); + *os << "**, src);" << be_nl + << "return *tmp;" << be_uidt_nl + << "}" << be_nl; + } + + os->gen_endif (); // endif macro + + // generate #endif for AHETI + os->gen_endif_AHETI(); + + delete visitor; + return 0; +} + diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp index fa7ad3ef39c..e052d5f6303 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ch.cpp @@ -14,6 +14,8 @@ // = AUTHOR // Michael Kircher // +// Modifications by Aniruddha Gokhale +// // ============================================================================ //#include "idl.h" @@ -63,6 +65,10 @@ be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node) ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CH); be_visitor *visitor = tao_cg->make_visitor (&ctx); + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + os->gen_ifdef_macro (class_name); os->indent (); @@ -73,19 +79,10 @@ be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node) << "// = Initialization and termination methods." << be_nl << be_nl; // constructor - *os << class_name << " (void) // Default constructor." << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (void); // Default constructor." << be_nl; // constructor - *os << class_name << " (CORBA::ULong maximum) " - << "// Constructor using a maximum length value." << be_idt_nl - << ": TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))" - << be_uidt_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (CORBA::ULong maximum); " << be_nl; // constructor *os << class_name << " (CORBA::ULong maximum," << be_idt_nl @@ -102,213 +99,67 @@ be_visitor_sequence_ch::gen_unbounded_sequence (be_sequence *node) -1); } *os << " *data," << be_nl - << "CORBA::Boolean release = 0)" << be_uidt_nl - << ": TAO_Unbounded_Base_Sequence (maximum, length, data, release)" << be_nl - << "{" << be_nl - << "}" << be_nl - << be_nl; + << "CORBA::Boolean release = 0);" << be_uidt_nl; // constructor - *os << class_name << " (const " << class_name << " &rhs)" << be_nl - << "// Copy constructor." << be_idt_nl; - *os << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl - << "{" << be_idt_nl; - pt->accept(visitor); - *os <<" *tmp1 = allocbuf (this->maximum_);" << be_nl; - pt->accept(visitor); - *os << " * const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); - *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl - << "tmp1[i] = tmp2[i];" << be_uidt_nl - << be_nl - << "this->buffer_ = tmp1;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " (const " << class_name << " &rhs);" << be_nl; // operator = - *os << class_name << " &operator= (const " << class_name << " &rhs)" << be_nl - << "// Assignment operator." << be_nl - << "{" << be_idt_nl - << "if (this == &rhs)" << be_idt_nl - << "return *this;" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_nl - << "{" << be_idt_nl - << "if (this->maximum_ < rhs.maximum_)" << be_nl - << "{" << be_idt_nl - << "// free the old buffer" << be_nl; - pt->accept (visitor); *os <<" *tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " *, this->buffer_);" << be_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else" << be_idt_nl - << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl - << be_nl - << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl - << be_nl; - pt->accept (visitor); *os <<" *tmp1 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " *, this->buffer_);" << be_nl; - pt->accept (visitor); *os <<" * const tmp2 = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl - << "tmp1[i] = tmp2[i];" << be_uidt_nl - << be_nl - << "return *this;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << class_name << " &operator= (const " << class_name << " &rhs);" << be_nl; // destructor - *os << "~" << class_name << " (void) // Dtor." << be_nl - << "{" << be_idt_nl - << "this->_deallocate_buffer ();" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "~" << class_name << " (void); // Dtor." << be_nl; // Accessors *os << "// = Accessors." << be_nl; - pt->accept (visitor); *os <<" &operator[] (CORBA::ULong i)" << be_nl - << "// operator []" << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (i < this->maximum_);" << be_nl; - pt->accept (visitor); *os <<"* tmp = ACE_reinterpret_cast("; - pt->accept (visitor); *os << "*,this->buffer_);" << be_nl - << "return tmp[i];" << be_uidt_nl - << "}" << be_nl - << be_nl; + pt->accept (visitor); + *os <<" &operator[] (CORBA::ULong i);" << be_nl; // operator[] - *os << "const "; pt->accept (visitor); *os << " &operator[] (CORBA::ULong i) const" << be_nl - << "// operator []" << be_nl - << "{" << be_idt_nl - << "ACE_ASSERT (i < this->maximum_);" << be_nl; - pt->accept (visitor); *os <<" * const tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << "* ACE_CAST_CONST, this->buffer_);" << be_nl - << "return tmp[i];" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "const "; + pt->accept (visitor); + *os << " &operator[] (CORBA::ULong i) const;" << be_nl; // Static operations *os << "// = Static operations." << be_nl - << "static "; pt->accept (visitor); *os << " *allocbuf (CORBA::ULong size)" << be_nl - << "// Allocate storage for the sequence." << be_nl - << "{" << be_idt_nl - << "return new "; pt->accept (visitor); *os << "[size];" << be_uidt_nl - << "}" << be_nl - << be_nl; - *os << "static void freebuf ("; pt->accept (visitor); *os << " *buffer)" << be_nl - << "// Free the sequence." << be_nl - << "{" << be_idt_nl - << "delete [] buffer;" << be_uidt_nl - << "}" << be_nl - << be_nl; + << "static "; + pt->accept (visitor); + *os << " *allocbuf (CORBA::ULong size);" << be_nl; + + *os << "static void freebuf ("; + pt->accept (visitor); + *os << " *buffer);" << be_nl; // allocate_buffer - *os << "virtual void _allocate_buffer (CORBA::ULong length)" << be_nl - << "{" << be_idt_nl; - pt->accept (visitor); *os <<"* tmp = allocbuf (length);" << be_nl - << be_nl - << "if (this->buffer_ != 0)" << be_nl - << "{" << be_idt_nl; - pt->accept (visitor); *os <<" *old = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " *,this->buffer_);" << be_nl - << be_nl - << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl - << "tmp[i] = old[i];" << be_uidt_nl - << be_nl - << "if (this->release_)" << be_idt_nl - << "freebuf (old);" << be_uidt_nl << be_uidt_nl - << "}" << be_nl - << "this->buffer_ = tmp;" << be_uidt_nl - << "}" << be_nl - << be_nl; + *os << "virtual void _allocate_buffer (CORBA::ULong length);" << be_nl; // deallocate_buffer - *os << "virtual void _deallocate_buffer (void)" << be_nl - << "{" << be_idt_nl - << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl - << "return;" << be_uidt_nl - << be_nl; - pt->accept(visitor); *os <<" *tmp = ACE_reinterpret_cast ("; - pt->accept (visitor); *os << " *,this->buffer_);" << be_nl - << be_nl - << "freebuf (tmp);" << be_nl - << "this->buffer_ = 0;" << be_uidt_nl - << "} " << be_nl - << be_nl; + *os << "virtual void _deallocate_buffer (void);" << be_nl; // Implement the TAO_Base_Sequence methods (see Sequence.h) *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl << be_nl; - pt->accept(visitor); *os <<" *get_buffer (CORBA::Boolean orphan = 0)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" *result = 0;" << be_nl - << "if (orphan == 0)" << be_nl - << "{" << be_idt_nl - << "// We retain ownership." << be_nl - << "if (this->buffer_ == 0)" << be_nl - << "{" << be_idt_nl - << "result = allocbuf (this->length_);" << be_nl - << "this->buffer_ = result;" << be_uidt_nl - << "}" << be_nl - << "else" << be_nl - << "{" << be_idt_nl - << "result = ACE_reinterpret_cast ("; pt->accept (visitor); *os << "*, this->buffer_);" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "else // if (orphan == 1)" << be_nl - << "{" << be_idt_nl - << "if (this->release_ != 0)" << be_nl - << "{" << be_idt_nl - << "// We set the state back to default and relinquish" << be_nl - << "// ownership." << be_nl - << "result = ACE_reinterpret_cast("; pt->accept (visitor); *os << "*,this->buffer_);" << be_nl - << "this->maximum_ = 0;" << be_nl - << "this->length_ = 0;" << be_nl - << "this->buffer_ = 0;" << be_nl - << "this->release_ = 0;" << be_uidt_nl - << "}" << be_uidt_nl - << "}" << be_nl - << "return result;" << be_uidt_nl - << "}" << be_nl - << be_nl; + pt->accept(visitor); + *os << " *get_buffer (CORBA::Boolean orphan = 0);" << be_nl; // get_buffer - *os << "const "; pt->accept (visitor); *os << " *get_buffer (void) const" << be_nl - << "{" << be_idt_nl - << "return ACE_reinterpret_cast(const "; - pt->accept (visitor); - *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl - << "}" << be_nl - << be_nl; - + *os << "const "; + pt->accept (visitor); + *os << " *get_buffer (void) const;" << be_nl; + // replace - *os << "void replace (CORBA::ULong max," << be_nl + *os << "void replace (CORBA::ULong max," << be_idt_nl << "CORBA::ULong length," << be_nl; - pt->accept(visitor); *os <<" *data," << be_nl - << "CORBA::Boolean release)" << be_nl - << "{" << be_idt_nl - << "this->maximum_ = max;" << be_nl - << "this->length_ = length;" << be_nl - << "if (this->buffer_ && this->release_ == 1)" << be_nl - << "{" << be_idt_nl; - pt->accept(visitor); *os <<" *tmp = ACE_reinterpret_cast("; pt->accept (visitor); *os << "*,this->buffer_);" << be_nl - << "freebuf (tmp);" << be_uidt_nl - << "}" << be_nl - << "this->buffer_ = data;" << be_nl - << "this->release_ = release;" << be_uidt_nl - << "}" << be_nl - << be_uidt_nl - << "};" << be_nl; - + pt->accept(visitor); + *os <<" *data," << be_nl + << "CORBA::Boolean release);" << be_uidt << be_uidt_nl; + *os << "};\n"; os->gen_endif (); // endif macro + // generate #endif for AHETI + os->gen_endif_AHETI(); delete visitor; return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp new file mode 100644 index 00000000000..967d0eb4981 --- /dev/null +++ b/TAO/TAO_IDL/be/be_visitor_sequence/gen_unbounded_sequence_ci.cpp @@ -0,0 +1,383 @@ +// $Id$ + +// ============================================================================ +// +// = LIBRARY +// TAO IDL +// +// = FILENAME +// gen_unbounded_sequence_ci.cpp +// +// = DESCRIPTION +// Visitor generating code for Sequence in the client inline +// +// = AUTHOR +// Michael Kircher +// +// Modifications by Aniruddha Gokhale +// +// ============================================================================ + +//#include "idl.h" +//#include "idl_extern.h" +#include "be.h" + +#include "be_visitor_sequence.h" + +ACE_RCSID(be_visitor_sequence, gen_unbounded_sequence_ci, "$Id$") + + +int +be_visitor_sequence_ci::gen_unbounded_sequence (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + // retrieve the base type since we may need to do some code + // generation for the base type. + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "Bad element type\n"), -1); + } + + // generate the class name + be_type *pt; // base types + + if (bt->node_type () == AST_Decl::NT_typedef) + { + // get the primitive base type of this typedef node + be_typedef *t = be_typedef::narrow_from_decl (bt); + pt = t->primitive_base_type (); + } + else + pt = bt; + + + const char * class_name = node->instance_name (); + + static char full_class_name [NAMEBUFSIZE]; + ACE_OS::memset (full_class_name, '\0', NAMEBUFSIZE); + + if (node->is_nested ()) + { + ACE_OS::sprintf (full_class_name, "%s::%s", + be_scope::narrow_from_scope (node->defined_in ())->decl ()->fullname (), + class_name); + } + else + { + ACE_OS::sprintf (full_class_name, "%s", + class_name); + } + + // get the visitor for the type of the sequence + be_visitor_context ctx (*this->ctx_); + ctx.state (TAO_CodeGen::TAO_SEQUENCE_BASE_CI); + be_visitor *visitor = tao_cg->make_visitor (&ctx); + + // !! branching in either compile time template instantiation + // or manual template instatiation + os->gen_ifdef_AHETI(); + + os->gen_ifdef_macro (class_name); + + os->indent (); + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (void) // Default constructor." << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (CORBA::ULong maximum) " + << "// Constructor using a maximum length value." << be_idt_nl + << ": TAO_Unbounded_Base_Sequence (maximum, allocbuf (maximum))" + << be_uidt_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (CORBA::ULong maximum," << be_idt_nl + << "CORBA::ULong length," << be_nl; + // the accept is here the first time used and if an + // error occurs, it will occur here. Later no check + // for errors will be done. + if (pt->accept (visitor) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "base type visit failed\n"), + -1); + } + *os << " *data," << be_nl + << "CORBA::Boolean release = 0)" << be_uidt_nl + << ": TAO_Unbounded_Base_Sequence (maximum, length, data, release)" << be_nl + << "{" << be_nl + << "}" << be_nl + << be_nl; + + // constructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::" << class_name << " (const " + << full_class_name << " &rhs)" << be_nl + << "// Copy constructor." << be_idt_nl; + *os << ": TAO_Unbounded_Base_Sequence (rhs)" << be_uidt_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" *tmp1 = allocbuf (this->maximum_);" << be_nl; + pt->accept(visitor); + *os << " * const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl + << "tmp1[i] = tmp2[i];" << be_uidt_nl + << be_nl + << "this->buffer_ = tmp1;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator = + *os << "ACE_INLINE " << full_class_name << " &" << be_nl + << full_class_name << "::operator= (const " << full_class_name << " &rhs)" << be_nl + << "// Assignment operator." << be_nl + << "{" << be_idt_nl + << "if (this == &rhs)" << be_idt_nl + << "return *this;" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_nl + << "{" << be_idt_nl + << "if (this->maximum_ < rhs.maximum_)" << be_nl + << "{" << be_idt_nl + << "// free the old buffer" << be_nl; + pt->accept (visitor); + *os <<" *tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " *, this->buffer_);" << be_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else" << be_idt_nl + << "this->buffer_ = allocbuf (rhs.maximum_);" << be_uidt_nl + << be_nl + << "TAO_Unbounded_Base_Sequence::operator= (rhs);" << be_nl + << be_nl; + pt->accept (visitor); + *os <<" *tmp1 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " *, this->buffer_);" << be_nl; + pt->accept (visitor); + *os <<" * const tmp2 = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " * ACE_CAST_CONST, rhs.buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl + << "tmp1[i] = tmp2[i];" << be_uidt_nl + << be_nl + << "return *this;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // destructor + *os << "ACE_INLINE" << be_nl + << full_class_name << "::~" << class_name << " (void) // Dtor." << be_nl + << "{" << be_idt_nl + << "this->_deallocate_buffer ();" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // Accessors + *os << "// = Accessors." << be_nl; + *os << "ACE_INLINE "; + pt->accept (visitor); + *os <<" &" << be_nl + << full_class_name << "::operator[] (CORBA::ULong i)" << be_nl + << "// operator []" << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (i < this->maximum_);" << be_nl; + pt->accept (visitor); + *os <<"* tmp = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "*,this->buffer_);" << be_nl + << "return tmp[i];" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // operator[] + *os << "ACE_INLINE const "; + pt->accept (visitor); + *os << " &" << be_nl + << full_class_name << "::operator[] (CORBA::ULong i) const" << be_nl + << "// operator []" << be_nl + << "{" << be_idt_nl + << "ACE_ASSERT (i < this->maximum_);" << be_nl; + pt->accept (visitor); + *os <<" * const tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "* ACE_CAST_CONST, this->buffer_);" << be_nl + << "return tmp[i];" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // Static operations + *os << "// = Static operations." << be_nl + << "ACE_INLINE "; + pt->accept (visitor); + *os << " *" << be_nl + << full_class_name << "::allocbuf (CORBA::ULong size)" << be_nl + << "// Allocate storage for the sequence." << be_nl + << "{" << be_idt_nl + << "return new "; + pt->accept (visitor); + *os << "[size];" << be_uidt_nl + << "}" << be_nl + << be_nl; + + *os << "ACE_INLINE void " + << full_class_name << "::freebuf ("; + pt->accept (visitor); + *os << " *buffer)" << be_nl + << "// Free the sequence." << be_nl + << "{" << be_idt_nl + << "delete [] buffer;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // allocate_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_allocate_buffer (CORBA::ULong length)" << be_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os <<"* tmp = allocbuf (length);" << be_nl + << be_nl + << "if (this->buffer_ != 0)" << be_nl + << "{" << be_idt_nl; + pt->accept (visitor); + *os <<" *old = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " *,this->buffer_);" << be_nl + << be_nl + << "for (CORBA::ULong i = 0; i < this->length_; ++i)" << be_idt_nl + << "tmp[i] = old[i];" << be_uidt_nl + << be_nl + << "if (this->release_)" << be_idt_nl + << "freebuf (old);" << be_uidt_nl << be_uidt_nl + << "}" << be_nl + << "this->buffer_ = tmp;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // deallocate_buffer + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::_deallocate_buffer (void)" << be_nl + << "{" << be_idt_nl + << "if (this->buffer_ == 0 || this->release_ == 0)" << be_idt_nl + << "return;" << be_uidt_nl + << be_nl; + pt->accept(visitor); + *os <<" *tmp = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << " *,this->buffer_);" << be_nl + << be_nl + << "freebuf (tmp);" << be_nl + << "this->buffer_ = 0;" << be_uidt_nl + << "} " << be_nl + << be_nl; + + // Implement the TAO_Base_Sequence methods (see Sequence.h) + *os << "// Implement the TAO_Base_Sequence methods (see Sequence.h)" << be_nl + << be_nl; + *os << "ACE_INLINE "; + pt->accept(visitor); + *os << " *" << be_nl + << full_class_name << "::get_buffer (CORBA::Boolean orphan = 0)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" *result = 0;" << be_nl + << "if (orphan == 0)" << be_nl + << "{" << be_idt_nl + << "// We retain ownership." << be_nl + << "if (this->buffer_ == 0)" << be_nl + << "{" << be_idt_nl + << "result = allocbuf (this->length_);" << be_nl + << "this->buffer_ = result;" << be_uidt_nl + << "}" << be_nl + << "else" << be_nl + << "{" << be_idt_nl + << "result = ACE_reinterpret_cast ("; + pt->accept (visitor); + *os << "*, this->buffer_);" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "else // if (orphan == 1)" << be_nl + << "{" << be_idt_nl + << "if (this->release_ != 0)" << be_nl + << "{" << be_idt_nl + << "// We set the state back to default and relinquish" << be_nl + << "// ownership." << be_nl + << "result = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "*,this->buffer_);" << be_nl + << "this->maximum_ = 0;" << be_nl + << "this->length_ = 0;" << be_nl + << "this->buffer_ = 0;" << be_nl + << "this->release_ = 0;" << be_uidt_nl + << "}" << be_uidt_nl + << "}" << be_nl + << "return result;" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // get_buffer + *os << "ACE_INLINE const "; + pt->accept (visitor); + *os << " *" << be_nl + << full_class_name << "::get_buffer (void) const" << be_nl + << "{" << be_idt_nl + << "return ACE_reinterpret_cast(const "; + pt->accept (visitor); + *os << " * ACE_CAST_CONST, this->buffer_);" << be_uidt_nl + << "}" << be_nl + << be_nl; + + // replace + *os << "ACE_INLINE void" << be_nl + << full_class_name << "::replace (CORBA::ULong max," << be_nl + << "CORBA::ULong length," << be_nl; + pt->accept(visitor); + *os <<" *data," << be_nl + << "CORBA::Boolean release)" << be_nl + << "{" << be_idt_nl + << "this->maximum_ = max;" << be_nl + << "this->length_ = length;" << be_nl + << "if (this->buffer_ && this->release_ == 1)" << be_nl + << "{" << be_idt_nl; + pt->accept(visitor); + *os <<" *tmp = ACE_reinterpret_cast("; + pt->accept (visitor); + *os << "*,this->buffer_);" << be_nl + << "freebuf (tmp);" << be_uidt_nl + << "}" << be_nl + << "this->buffer_ = data;" << be_nl + << "this->release_ = release;" << be_uidt_nl + << "}" << be_nl; + + os->gen_endif (); // endif macro + + // generate #endif for AHETI + os->gen_endif_AHETI(); + + delete visitor; + return 0; +} diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 63d24ff71ab..5a7043d5a2e 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -245,9 +245,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) // end of instantiation - - - // generate the ifdefined macro for the sequence type + // generate the ifdefined macro for the sequence type os->gen_ifdef_macro (node->flatname ()); os->indent (); // start with the current indentation level diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp index d5a5fb2a9d1..5d4fc8a2f09 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ci.cpp @@ -49,6 +49,18 @@ be_visitor_sequence_ci::visit_sequence (be_sequence *node) if (node->cli_inline_gen () || node->imported ()) return 0; + // instantiation + + if (this->instantiate_sequence (node) == -1) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ci::" + "visit_sequence - " + "codegen. for the primitive type sequence\n"), + -1); + } + + // end of instantiation // all we do is generate the _var and _out implementations if (this->gen_var_impl (node) == -1) @@ -71,6 +83,88 @@ be_visitor_sequence_ci::visit_sequence (be_sequence *node) } int +be_visitor_sequence_ci::instantiate_sequence (be_sequence *node) +{ + TAO_OutStream *os = this->ctx_->stream (); + be_type *bt; + + bt = be_type::narrow_from_decl (node->base_type ()); + if (!bt) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_visitor_sequence_ch::" + "gen_instantiate_template_name - " + "Bad element type\n"), -1); + } + + // generate the appropriate sequence type + switch (node->managed_type ()) + { + case be_sequence::MNG_PSEUDO: + case be_sequence::MNG_OBJREF: + if (node->unbounded ()) + this->gen_unbounded_obj_sequence (node); + else + this->gen_bounded_obj_sequence (node); + break; + case be_sequence::MNG_STRING: // sequence of strings + if (!node->unbounded ()) + this->gen_bounded_str_sequence (node); + // else + // inheriting from the right class is enough + break; + default: // not a managed type + if (node->unbounded ()) + { +#if 1 + // TAO provides extensions for octet sequences, first find out + // if the base type is an octet (or an alias for octet) + be_predefined_type *predef = 0; + if (bt->base_node_type () == AST_Type::NT_pre_defined) + { + be_typedef* alias = + be_typedef::narrow_from_decl (bt); + + if (alias == 0) + { + predef = + be_predefined_type::narrow_from_decl (bt); + } + else + { + predef = be_predefined_type::narrow_from_decl + (alias->primitive_base_type ()); + } + } + if (predef != 0) + { + if (predef->pt() != AST_PredefinedType::PT_octet) + this->gen_unbounded_sequence (node); + } + else + this->gen_unbounded_sequence (node); +#else + // @@ This needs to be fixed. (Michael) + be_predefined_type * bpt = + be_predefined_type::narrow_from_decl (node->base_type()); + if (bpt) + { + if (bpt->pt() != AST_PredefinedType::PT_octet) + this->gen_unbounded_sequence (node); + } + else + this->gen_unbounded_sequence (node); +#endif + } + else + this->gen_bounded_sequence (node); + break; + } + + return 0; +} + +int be_visitor_sequence_ci::gen_var_impl (be_sequence *node) { TAO_OutStream *os; // output stream diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h index c2b8508fe7a..de026499c8d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ci.h @@ -45,6 +45,27 @@ public: virtual int visit_sequence (be_sequence *node); // visit sequence node + virtual int gen_unbounded_sequence (be_sequence *node); + // generate a instance of the unbounded sequence + + virtual int gen_bounded_sequence (be_sequence *node); + // generate a instance of the bounded sequence + + virtual int gen_unbounded_obj_sequence (be_sequence *node); + // generate a instance of the unbounded object sequence + + virtual int gen_bounded_obj_sequence (be_sequence *node); + // generate a instance of the bounded object sequence + + virtual int gen_bounded_str_sequence (be_sequence *node); + // generate a instance of the bounded string sequence + + virtual int instantiate_sequence (be_sequence *node); + // determine which sequence to instantiate + + virtual int gen_object_manager (be_sequence *node); + // generate a instance of the object manager + virtual int gen_var_impl (be_sequence *node); // generate the var impl diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html index 2bfa4fdc4a4..a9acace4951 100644 --- a/TAO/docs/releasenotes/index.html +++ b/TAO/docs/releasenotes/index.html @@ -78,9 +78,22 @@ A complete list of all modifications to TAO is available in the <A HREF="http:// <A NAME="idl"></A>IDL Compiler</H3> Point of contact: <A HREF="mailto:gokhale@research.bell-labs.com">Aniruddha Gokhale</A> -<P>Current status: (As of November 15, 1998.) +<P>Current status: (As of Dec 11, 1998.) <UL> <LI> + Compile problems with sequence of forward declared interfaces is + fixed. In addition, problems with sequence of CORBA::Objects is + fixed. In this specific case, we were not generating the + _downcast and _upcase methods. + </LI> + + <LI> + Some more problems with the front-end have been fixed. In + particular, oneway operations with a "raises" clause or having an + "inout", "out", or "return" mode is flagged as an error. + </LI> + + <LI> For platforms that support namespaces, we now allow reopening modules. </LI> |