Changeset 345 for XIOS/trunk/src/interface

Timestamp:

03/30/12 17:45:29 (12 years ago)

Author:

ymipsl

Message:

removed "tree" namespace

YM

Location:

XIOS/trunk/src/interface

Files:

• c/icaxis.cpp (modified) (5 diffs)
• c/iccontext.cpp (modified) (3 diffs)
• c/icdata.cpp (modified) (1 diff)
• c/icdate.cpp (modified) (2 diffs)
• c/icdomain.cpp (modified) (5 diffs)
• c/icfield.cpp (modified) (5 diffs)
• c/icfile.cpp (modified) (5 diffs)
• c/icgrid.cpp (modified) (5 diffs)
• c/icxml_tree.cpp (modified) (1 diff)
• c_attr/icaxis_attr.cpp (modified) (1 diff)
• c_attr/icaxisgroup_attr.cpp (modified) (1 diff)
• c_attr/iccontext_attr.cpp (modified) (1 diff)
• c_attr/icdomain_attr.cpp (modified) (1 diff)
• c_attr/icdomaingroup_attr.cpp (modified) (1 diff)
• c_attr/icfield_attr.cpp (modified) (1 diff)
• c_attr/icfieldgroup_attr.cpp (modified) (1 diff)
• c_attr/icfile_attr.cpp (modified) (1 diff)
• c_attr/icfilegroup_attr.cpp (modified) (1 diff)
• c_attr/icgrid_attr.cpp (modified) (1 diff)
• c_attr/icgridgroup_attr.cpp (modified) (1 diff)

XIOS/trunk/src/interface/c/icaxis.cpp

@@ -20 +20 @@
    // ----------------------- Redéfinition de types ----------------------------
    
-   typedef xios::tree::CAxis      * XAxisPtr;
-   typedef xios::tree::CAxisGroup * XAxisGroupPtr;
+   typedef xios::CAxis      * XAxisPtr;
+   typedef xios::CAxisGroup * XAxisGroupPtr;
 
    // ------------------------ Création des handle -----------------------------
@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CAxis>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CAxis>(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CAxisGroup>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CAxisGroup>(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CAxis>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CAxis>(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CAxisGroup>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CAxisGroup>(id);
    }
    

XIOS/trunk/src/interface/c/iccontext.cpp

@@ -24 +24 @@
    typedef enum { D360 = 0 , ALLLEAP, NOLEAP, JULIAN, GREGORIAN } XCalendarType ;
 
-   typedef xios::tree::CContext * XContextPtr;
+   typedef xios::CContext * XContextPtr;
 
    // ------------------------ Création des handle -----------------------------
@@ -33 +33 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      std::vector<boost::shared_ptr<xios::tree::CContext> > def_vector =
-            xios::tree::CContext::GetContextGroup()->getChildList();
+      std::vector<boost::shared_ptr<xios::CContext> > def_vector =
+            xios::CContext::GetContextGroup()->getChildList();
 
       for (std::size_t i = 0; i < def_vector.size(); i++)
@@ -60 +60 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      std::vector<boost::shared_ptr<xios::tree::CContext> > def_vector =
-            xios::tree::CContext::GetContextGroup()->getChildList();
+      std::vector<boost::shared_ptr<xios::CContext> > def_vector =
+            xios::CContext::GetContextGroup()->getChildList();
 
       for (std::size_t i = 0; i < def_vector.size(); i++)

XIOS/trunk/src/interface/c/icdata.cpp

@@ -31 +31 @@
    typedef enum { NETCDF4 = 0 } XFileType;
    
-   typedef xios::tree::CContext * XContextPtr;
+   typedef xios::CContext * XContextPtr;
 
    // -------------------- Traitement des données ------------------------------

XIOS/trunk/src/interface/c/icdate.cpp

@@ -26 +26 @@
       {
          CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second};
-         boost::shared_ptr<xios::tree::CContext> context =
-         xios::CObjectFactory::GetObject<xios::tree::CContext>
+         boost::shared_ptr<xios::CContext> context =
+         xios::CObjectFactory::GetObject<xios::CContext>
             (CObjectFactory::GetCurrentContextId());
          
@@ -42 +42 @@
    void cxios_update_calendar(int step)
    {
-      boost::shared_ptr<xios::tree::CContext> context =
-            xios::CObjectFactory::GetObject<xios::tree::CContext>
+      boost::shared_ptr<xios::CContext> context =
+            xios::CObjectFactory::GetObject<xios::CContext>
             (CObjectFactory::GetCurrentContextId());
       context->updateCalendar(step) ;

XIOS/trunk/src/interface/c/icdomain.cpp

@@ -20 +20 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::tree::CDomain      * XDomainPtr;
-   typedef xios::tree::CDomainGroup * XDomainGroupPtr;
+   typedef xios::CDomain      * XDomainPtr;
+   typedef xios::CDomainGroup * XDomainGroupPtr;
 
    // ------------------------ Création des handle -----------------------------
@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CDomain>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CDomain>(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CDomainGroup>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CDomainGroup>(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CDomain>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CDomain>(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CDomainGroup>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CDomainGroup>(id);
    }
 } // extern "C"

XIOS/trunk/src/interface/c/icfield.cpp

@@ -20 +20 @@
    // ----------------------- Redéfinition de types ----------------------------
    
-   typedef xios::tree::CField      * XFieldPtr;
-   typedef xios::tree::CFieldGroup * XFieldGroupPtr;
+   typedef xios::CField      * XFieldPtr;
+   typedef xios::CFieldGroup * XFieldGroupPtr;
    
 // --------------------------------------------------------------------------   
@@ -32 +32 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CField>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CField>(id).get();
    }
    
@@ -40 +40 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CFieldGroup>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CFieldGroup>(id).get();
    }
 
@@ -51 +51 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CField>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CField>(id);
    }
 
@@ -59 +59 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CFieldGroup>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CFieldGroup>(id);
    }
 

XIOS/trunk/src/interface/c/icfile.cpp

@@ -20 +20 @@
    // ----------------------- Redéfinition de types ----------------------------
    
-   typedef xios::tree::CFile      * XFilePtr;
-   typedef xios::tree::CFileGroup * XFileGroupPtr;
+   typedef xios::CFile      * XFilePtr;
+   typedef xios::CFileGroup * XFileGroupPtr;
 
    // ------------------------ Création des handle -----------------------------
@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CFile>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CFile>(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CFileGroup>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CFileGroup>(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CFile>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CFile>(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CFileGroup>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CFileGroup>(id);
    }
 } // extern "C"

XIOS/trunk/src/interface/c/icgrid.cpp

@@ -20 +20 @@
    // ----------------------- Redéfinition de types ----------------------------
    
-   typedef xios::tree::CGrid      * XGridPtr;
-   typedef xios::tree::CGridGroup * XGridGroupPtr;
+   typedef xios::CGrid      * XGridPtr;
+   typedef xios::CGridGroup * XGridGroupPtr;
 
    // ------------------------ Création des handle -----------------------------
@@ -30 +30 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CGrid>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CGrid>(id).get();
    }
    
@@ -38 +38 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::GetObject<xios::tree::CGridGroup>(id).get();
+      *_ret = xios::CObjectFactory::GetObject<xios::CGridGroup>(id).get();
    }
 
@@ -48 +48 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CGrid>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CGrid>(id);
    }
 
@@ -56 +56 @@
       if (!cstr2string(_id, _id_len, id)) return;
 
-      *_ret = xios::CObjectFactory::HasObject<xios::tree::CGridGroup>(id);
+      *_ret = xios::CObjectFactory::HasObject<xios::CGridGroup>(id);
    }
 } // extern "C"

XIOS/trunk/src/interface/c/icxml_tree.cpp

@@ -20 +20 @@
    // ----------------------- Redéfinition de types ----------------------------
 
-   typedef xios::tree::CContext * XContextPtr;
-
-   typedef xios::tree::CGrid      * XGridPtr;
-   typedef xios::tree::CGridGroup * XGridGroupPtr;
-
-   typedef xios::tree::CFile      * XFilePtr;
-   typedef xios::tree::CFileGroup * XFileGroupPtr;
-
-   typedef xios::tree::CField      * XFieldPtr;
-   typedef xios::tree::CFieldGroup * XFieldGroupPtr;
-
-   typedef xios::tree::CDomain      * XDomainPtr;
-   typedef xios::tree::CDomainGroup * XDomainGroupPtr;
-
-   typedef xios::tree::CAxis      * XAxisPtr;
-   typedef xios::tree::CAxisGroup * XAxisGroupPtr;
+   typedef xios::CContext * XContextPtr;
+
+   typedef xios::CGrid      * XGridPtr;
+   typedef xios::CGridGroup * XGridGroupPtr;
+
+   typedef xios::CFile      * XFilePtr;
+   typedef xios::CFileGroup * XFileGroupPtr;
+
+   typedef xios::CField      * XFieldPtr;
+   typedef xios::CFieldGroup * XFieldGroupPtr;
+
+   typedef xios::CDomain      * XDomainPtr;
+   typedef xios::CDomainGroup * XDomainGroupPtr;
+
+   typedef xios::CAxis      * XAxisPtr;
+   typedef xios::CAxisGroup * XAxisGroupPtr;
    
    // ----------------------- Ajout d'enfant à un parent -----------------------

XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CAxis*  axis_Ptr;
+  typedef xios::CAxis*  axis_Ptr;
   
   void cxios_set_axis_long_name(axis_Ptr axis_hdl, const char * long_name, int long_name_size)

XIOS/trunk/src/interface/c_attr/icaxisgroup_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CAxisGroup*  axisgroup_Ptr;
+  typedef xios::CAxisGroup*  axisgroup_Ptr;
   
   void cxios_set_axisgroup_group_ref(axisgroup_Ptr axisgroup_hdl, const char * group_ref, int group_ref_size)

XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CContext*  context_Ptr;
+  typedef xios::CContext*  context_Ptr;
   
   void cxios_set_context_calendar_type(context_Ptr context_hdl, const char * calendar_type, int calendar_type_size)

XIOS/trunk/src/interface/c_attr/icdomain_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CDomain*  domain_Ptr;
+  typedef xios::CDomain*  domain_Ptr;
   
   void cxios_set_domain_data_dim(domain_Ptr domain_hdl, int data_dim)

XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CDomainGroup*  domaingroup_Ptr;
+  typedef xios::CDomainGroup*  domaingroup_Ptr;
   
   void cxios_set_domaingroup_data_dim(domaingroup_Ptr domaingroup_hdl, int data_dim)

XIOS/trunk/src/interface/c_attr/icfield_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CField*  field_Ptr;
+  typedef xios::CField*  field_Ptr;
   
   void cxios_set_field_axis_ref(field_Ptr field_hdl, const char * axis_ref, int axis_ref_size)

XIOS/trunk/src/interface/c_attr/icfieldgroup_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CFieldGroup*  fieldgroup_Ptr;
+  typedef xios::CFieldGroup*  fieldgroup_Ptr;
   
   void cxios_set_fieldgroup_axis_ref(fieldgroup_Ptr fieldgroup_hdl, const char * axis_ref, int axis_ref_size)

XIOS/trunk/src/interface/c_attr/icfile_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CFile*  file_Ptr;
+  typedef xios::CFile*  file_Ptr;
   
   void cxios_set_file_description(file_Ptr file_hdl, const char * description, int description_size)

XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CFileGroup*  filegroup_Ptr;
+  typedef xios::CFileGroup*  filegroup_Ptr;
   
   void cxios_set_filegroup_description(filegroup_Ptr filegroup_hdl, const char * description, int description_size)

XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CGrid*  grid_Ptr;
+  typedef xios::CGrid*  grid_Ptr;
   
   void cxios_set_grid_axis_ref(grid_Ptr grid_hdl, const char * axis_ref, int axis_ref_size)

XIOS/trunk/src/interface/c_attr/icgridgroup_attr.cpp

@@ -13 +13 @@
 extern "C"
 {
-  typedef xios::tree::CGridGroup*  gridgroup_Ptr;
+  typedef xios::CGridGroup*  gridgroup_Ptr;
   
   void cxios_set_gridgroup_axis_ref(gridgroup_Ptr gridgroup_hdl, const char * axis_ref, int axis_ref_size)