INTEGRATION: CWS adc18 (1.5.2); FILE MERGED

2007/10/18 13:40:04 np 1.5.2.1: #i81775#

9 files changed, 84 insertions, 104 deletions

diff --git a/autodoc/source/ary/idl/i_constant.cxx b/autodoc/source/ary/idl/i_constant.cxx
index bbb1436d3752..255202592e77 100644
--- a/autodoc/source/ary/idl/i_constant.cxx
+++ b/autodoc/source/ary/idl/i_constant.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_constant.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:31:34 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:43:39 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,7 +38,7 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary/idl/ihost_ce.hxx>
+#include <cosv/tpl/processor.hxx>
 #include <ary/idl/ik_constant.hxx>
 
 
@@ -65,14 +65,14 @@ Constant::~Constant()
 }
 
 void
-Constant::do_Visit_CeHost( CeHost & o_rHost ) const
+Constant::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_Constant(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
 
-RCid
-Constant::inq_ClassId() const
+ClassId
+Constant::get_AryClass() const
 {
     return class_id;
 }
@@ -108,7 +108,7 @@ namespace ifc_constant
 inline const Constant &
 constant_cast( const CodeEntity &  i_ce )
 {
-    csv_assert( i_ce.ClassId() == Constant::class_id );
+    csv_assert( i_ce.AryClass() == Constant::class_id );
     return static_cast< const Constant& >(i_ce);
 }
 
diff --git a/autodoc/source/ary/idl/i_enum.cxx b/autodoc/source/ary/idl/i_enum.cxx
index 047a789b0ff7..69fc449aeffa 100644
--- a/autodoc/source/ary/idl/i_enum.cxx
+++ b/autodoc/source/ary/idl/i_enum.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_enum.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:32:04 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:44:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,9 +39,9 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary/idl/ihost_ce.hxx>
+#include <cosv/tpl/processor.hxx>
 #include <sci_impl.hxx>
-#include "ipi_2s.hxx"
+#include "i2s_calculator.hxx"
 
 
 namespace ary
@@ -62,13 +62,13 @@ Enum::~Enum()
 }
 
 void
-Enum::do_Visit_CeHost( CeHost & o_rHost ) const
+Enum::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_Enum(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-Enum::inq_ClassId() const
+ClassId
+Enum::get_AryClass() const
 {
     return class_id;
 }
@@ -104,7 +104,7 @@ namespace ifc_enum
 inline const Enum &
 enum_cast( const CodeEntity & i_ce )
 {
-    csv_assert( i_ce.ClassId() == Enum::class_id );
+    csv_assert( i_ce.AryClass() == Enum::class_id );
     return static_cast< const Enum& >(i_ce);
 }
 
@@ -149,4 +149,3 @@ xref::Get_AsDataTypes( Dyn_CeIterator &    o_result,
 
 }   //  namespace   idl
 }   //  namespace   ary
-
diff --git a/autodoc/source/ary/idl/i_function.cxx b/autodoc/source/ary/idl/i_function.cxx
index 5e8e3e5efa6f..21a2492bed7d 100644
--- a/autodoc/source/ary/idl/i_function.cxx
+++ b/autodoc/source/ary/idl/i_function.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_function.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:32:50 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:44:55 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,7 +38,7 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary/idl/ihost_ce.hxx>
+#include <cosv/tpl/processor.hxx>
 #include <sci_impl.hxx>
 
 
@@ -83,13 +83,13 @@ Function::~Function()
 }
 
 void
-Function::do_Visit_CeHost( CeHost & o_rHost ) const
+Function::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_Function( *this );
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-Function::inq_ClassId() const
+ClassId
+Function::get_AryClass() const
 {
     return class_id;
 }
@@ -125,7 +125,7 @@ namespace ifc_function
 inline const Function &
 function_cast( const CodeEntity &  i_ce )
 {
-    csv_assert( i_ce.ClassId() == Function::class_id );
+    csv_assert( i_ce.AryClass() == Function::class_id );
     return static_cast< const Function& >(i_ce);
 }
 
diff --git a/autodoc/source/ary/idl/i_module.cxx b/autodoc/source/ary/idl/i_module.cxx
index 83b389aff330..167066c9feb5 100644
--- a/autodoc/source/ary/idl/i_module.cxx
+++ b/autodoc/source/ary/idl/i_module.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_module.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:33:19 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:45:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,6 +38,7 @@
 #include <ary/idl/ik_module.hxx>
 
 // NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
 #include <ary/idl/i_gate.hxx>
 #include <ary/idl/i_module.hxx>
 #include <ary/idl/i_service.hxx>
@@ -50,7 +51,6 @@
 #include <ary/idl/i_singleton.hxx>
 #include <ary/idl/i_siservice.hxx>
 #include <ary/idl/i_sisingleton.hxx>
-#include <ary/idl/ihost_ce.hxx>
 #include <ary/idl/ip_ce.hxx>
 #include <nametreenode.hxx>
 #include "i_strconst.hxx"
@@ -139,16 +139,13 @@ Module::Depth() const
 }
 
 void
-Module::do_Visit_CeHost( CeHost & o_rHost ) const
+Module::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    Dyn_StdConstIterator<Ce_id>
-        pLocalNames;
-    pImpl->Get_Names(pLocalNames);
-    o_rHost.Do_Module(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-Module::inq_ClassId() const
+ClassId
+Module::get_AryClass() const
 {
     return class_id;
 }
@@ -184,7 +181,7 @@ namespace ifc_module
 inline const Module &
 module_cast( const CodeEntity &  i_ce )
 {
-    csv_assert( i_ce.ClassId() == Module::class_id );
+    csv_assert( i_ce.AryClass() == Module::class_id );
     return static_cast< const Module& >(i_ce);
 }
 
@@ -213,7 +210,7 @@ attr::Get_AllChildrenSeparated( std::vector< const CodeEntity* > & o_nestedModul
           ++it )
     {
         pCe = &i_pilot.Find_Ce( (*it).second );
-        switch (pCe->ClassId())
+        switch (pCe->AryClass())
         {
             case Module::class_id:
                         o_nestedModules.push_back(pCe);
diff --git a/autodoc/source/ary/idl/i_service.cxx b/autodoc/source/ary/idl/i_service.cxx
index 2604aaca4bfa..2b04f80fa4b8 100644
--- a/autodoc/source/ary/idl/i_service.cxx
+++ b/autodoc/source/ary/idl/i_service.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_service.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:34:33 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:46:58 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,11 +38,11 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary/idl/ihost_ce.hxx>
+#include <cosv/tpl/processor.hxx>
 #include <ary/idl/ik_service.hxx>
-#include <ary_i/codeinf2.hxx>
+#include <ary/doc/d_oldidldocu.hxx>
 #include <sci_impl.hxx>
-#include "ipi_2s.hxx"
+#include "i2s_calculator.hxx"
 
 
 namespace ary
@@ -90,13 +90,13 @@ Service::Get_IncludedServices( Dyn_StdConstIterator<CommentedRelation> & o_rResu
 }
 
 void
-Service::do_Visit_CeHost( CeHost & o_rHost ) const
+Service::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_Service(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-Service::inq_ClassId() const
+ClassId
+Service::get_AryClass() const
 {
     return class_id;
 }
@@ -132,7 +132,7 @@ namespace ifc_service
 inline const Service &
 service_cast( const CodeEntity &  i_ce )
 {
-    csv_assert( i_ce.ClassId() == Service::class_id );
+    csv_assert( i_ce.AryClass() == Service::class_id );
     return static_cast< const Service& >(i_ce);
 }
 
@@ -177,4 +177,3 @@ xref::Get_InstantiatingSingletons( Dyn_CeIterator &    o_result,
 
 }   //  namespace   idl
 }   //  namespace   ary
-
diff --git a/autodoc/source/ary/idl/i_siservice.cxx b/autodoc/source/ary/idl/i_siservice.cxx
index 9677c21efefd..f2030c13e302 100644
--- a/autodoc/source/ary/idl/i_siservice.cxx
+++ b/autodoc/source/ary/idl/i_siservice.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_siservice.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:35:03 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:47:31 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,7 +39,7 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary/idl/ihost_ce.hxx>
+#include <cosv/tpl/processor.hxx>
 #include <sci_impl.hxx>
 
 
@@ -63,13 +63,13 @@ SglIfcService::~SglIfcService()
 }
 
 void
-SglIfcService::do_Visit_CeHost( CeHost & o_rHost ) const
+SglIfcService::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_SglIfcService(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-SglIfcService::inq_ClassId() const
+ClassId
+SglIfcService::get_AryClass() const
 {
     return class_id;
 }
@@ -105,7 +105,7 @@ namespace ifc_sglifcservice
 inline const SglIfcService &
 sglifcservice_cast( const CodeEntity &  i_ce )
 {
-    csv_assert( i_ce.ClassId() == SglIfcService::class_id );
+    csv_assert( i_ce.AryClass() == SglIfcService::class_id );
     return static_cast< const SglIfcService& >(i_ce);
 }
 
@@ -127,4 +127,3 @@ attr::Get_Constructors( Dyn_CeIterator &    o_result,
 
 }   //  namespace   idl
 }   //  namespace   ary
-
diff --git a/autodoc/source/ary/idl/i_sisingleton.cxx b/autodoc/source/ary/idl/i_sisingleton.cxx
index da310c5bc055..886569e28b48 100644
--- a/autodoc/source/ary/idl/i_sisingleton.cxx
+++ b/autodoc/source/ary/idl/i_sisingleton.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_sisingleton.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:35:17 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:47:46 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,8 +38,8 @@
 
 
 // NOT FULLY DECLARED SERVICES
+#include <cosv/tpl/processor.hxx>
 #include <ary/idl/ik_sisingleton.hxx>
-#include <ary/idl/ihost_ce.hxx>
 
 
 
@@ -62,13 +62,13 @@ SglIfcSingleton::~SglIfcSingleton()
 }
 
 void
-SglIfcSingleton::do_Visit_CeHost( CeHost & o_rHost ) const
+SglIfcSingleton::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_SglIfcSingleton(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-SglIfcSingleton::inq_ClassId() const
+ClassId
+SglIfcSingleton::get_AryClass() const
 {
     return class_id;
 }
@@ -103,7 +103,7 @@ namespace ifc_sglifcsingleton
 inline const SglIfcSingleton &
 sglifcsingleton_cast( const CodeEntity &  i_ce )
 {
-    csv_assert( i_ce.ClassId() == SglIfcSingleton::class_id );
+    csv_assert( i_ce.AryClass() == SglIfcSingleton::class_id );
     return static_cast< const SglIfcSingleton& >(i_ce);
 }
 
@@ -119,4 +119,3 @@ attr::BaseInterface( const CodeEntity & i_ce )
 
 }   //  namespace   idl
 }   //  namespace   ary
-
diff --git a/autodoc/source/ary/idl/i_typedef.cxx b/autodoc/source/ary/idl/i_typedef.cxx
index abc87bd89588..38c21735297e 100644
--- a/autodoc/source/ary/idl/i_typedef.cxx
+++ b/autodoc/source/ary/idl/i_typedef.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: i_typedef.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:36:20 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:49:13 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -39,9 +39,9 @@
 
 
 // NOT FULLY DECLARED SERVICES
-#include <ary/idl/ihost_ce.hxx>
+#include <cosv/tpl/processor.hxx>
 #include <sci_impl.hxx>
-#include "ipi_2s.hxx"
+#include "i2s_calculator.hxx"
 
 
 namespace ary
@@ -64,13 +64,13 @@ Typedef::~Typedef()
 }
 
 void
-Typedef::do_Visit_CeHost( CeHost & o_rHost ) const
+Typedef::do_Accept( csv::ProcessorIfc & io_processor ) const
 {
-    o_rHost.Do_Typedef(*this);
+    csv::CheckedCall(io_processor, *this);
 }
 
-RCid
-Typedef::inq_ClassId() const
+ClassId
+Typedef::get_AryClass() const
 {
     return class_id;
 }
@@ -106,7 +106,7 @@ namespace ifc_typedef
 inline const Typedef &
 typedef_cast( const CodeEntity & i_ce )
 {
-    csv_assert( i_ce.ClassId() == Typedef::class_id );
+    csv_assert( i_ce.AryClass() == Typedef::class_id );
     return static_cast< const Typedef& >(i_ce);
 }
 
diff --git a/autodoc/source/ary/idl/is_ce.cxx b/autodoc/source/ary/idl/is_ce.cxx
index 375b71204627..cb7d378342f7 100644
--- a/autodoc/source/ary/idl/is_ce.cxx
+++ b/autodoc/source/ary/idl/is_ce.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: is_ce.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: vg $ $Date: 2007-09-18 13:37:46 $
+ *  last change: $Author: hr $ $Date: 2007-11-02 15:52:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,6 +38,11 @@
 
 // NOT FULLY DEFINED SERVICES
 
+namespace
+{
+    const uintt
+    C_nReservedElements = ary::idl::predefined::ce_MAX;    // Skipping "0" and the GlobalNamespace
+}
 
 
 namespace ary
@@ -45,42 +50,24 @@ namespace ary
 namespace idl
 {
 
+Ce_Storage *        Ce_Storage::pInstance_ = 0;
 
-namespace
-{
-const uintt C_nReservedElements = predefined::ce_MAX;    // Skipping "0" and the GlobalNamespace
-}
 
 
-Ce_Storage::Ce_Storage( uintt  i_nBLOCK_SIZE_LOG_2,
-                        uintt  i_nInitialNrOfBlocks )
-    :   aContainer(i_nBLOCK_SIZE_LOG_2, C_nReservedElements, i_nInitialNrOfBlocks)
-{
-}
 
-Ce_Storage::~Ce_Storage()
+Ce_Storage::Ce_Storage()
+    :   stg::Storage<CodeEntity>(C_nReservedElements)
 {
+    csv_assert(pInstance_ == 0);
+    pInstance_ = this;
 }
 
-void
-Ce_Storage::EraseAll()
-{
-    aContainer.EraseAll();
-}
-
-void
-Ce_Storage::Save( PersistenceAdmin &  ) const
-{
-    // KORR_FUTURE
-}
-
-void
-Ce_Storage::Load( PersistenceAdmin & )
+Ce_Storage::~Ce_Storage()
 {
-    // KORR_FUTURE
+    csv_assert(pInstance_ != 0);
+    pInstance_ = 0;
 }
 
 
 }   // namespace idl
 }   // namespace ary
-