Changeset 257

Timestamp:

08/23/11 12:34:28 (12 years ago)

Author:

hozdoba

Message:

Ajout de classes pour la version 4

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (3 diffs)
• src/xmlio/node/file.hpp (modified) (1 diff)
• src4/xmlio/attribute (added)
• src4/xmlio/attribute/attribute.cpp (added)
• src4/xmlio/attribute/attribute.hpp (added)
• src4/xmlio/attribute/attribute_impl.hpp (added)
• src4/xmlio/attribute/attribute_map.cpp (added)
• src4/xmlio/attribute/attribute_map.hpp (added)
• src4/xmlio/attribute/attribute_template.cpp (added)
• src4/xmlio/attribute/attribute_template.hpp (added)
• src4/xmlio/attribute/attribute_template_impl.hpp (added)
• src4/xmlio/xmlioserver_spl.hpp (modified) (1 diff)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -211 +211 @@
 MPII_PATH = $(SRC_PATH)/mpi
 NCDF_PATH = $(SRC_PATH)/netcdf
+ATT_PATH = $(SRC_PATH)/attribute
 GUI_PATH  = $(SRC_PATH)/qt
 VTK_PATH  = $(SRC_PATH)/vtk
@@ -221 +222 @@
 
 VPATH = $(DEP_PATH):$(SRC_PATH):$(CSRC_PATH):$(NODE_PATH):$(XML_PATH):$(BUFF_PATH)\
-:$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH):$(NCDF_PATH)\
+:$(FUNC_PATH):$(DATE_PATH):$(GUI_PATH):$(VTK_PATH):$(INPT_PATH):$(NCDF_PATH):$(ATT_PATH)\
 :$(OUPT_PATH):$(MNGR_PATH):$(FAKE_PATH):$(FSRC_PATH):$(CONF_PATH):$(MPII_PATH)
 
@@ -410 +411 @@
 ifeq ($(VERSION), 4)
         ELEMS_CPP = object exception xml_node xml_parser inetcdf4 inetcdf4_adv onetcdf4 lscereader mpi_interface\
+        attribute attribute_template attribute_map
                
 endif

XMLIO_V2/dev/dev_rv/src/xmlio/node/file.hpp

@@ -53 +53 @@
          std::vector<boost::shared_ptr<CField> >
             getEnabledFields(int default_outputlevel = 5,
-                             int default_level = 1,
-                             bool default_enabled = true);
+                             int default_level       = 1,
+                             bool default_enabled    = true);
 
       public :

XMLIO_V2/dev/dev_rv/src4/xmlio/xmlioserver_spl.hpp

@@ -22 +22 @@
 #define XIOS_UNUSED(param)
 
+//! Définit le type des map.
+#include <map>
+#define xios_map std::map
+
 #endif //__XMLIO_SPL__