Changeset 345
- Timestamp:
- 03/30/12 17:45:29 (12 years ago)
- Location:
- XIOS/trunk/src
- Files:
-
- 67 edited
Legend:
- Unmodified
- Added
- Removed
-
XIOS/trunk/src/attribute.cpp
r335 r345 4 4 namespace xios 5 5 { 6 namespace tree7 {8 6 /// ////////////////////// Définitions ////////////////////// /// 9 7 CAttribute::CAttribute(const StdString & id) … … 54 52 ///-------------------------------------------------------------- 55 53 56 } // namespace tree57 54 58 CMessage& operator<<(CMessage& msg, tree::CAttribute& type)55 CMessage& operator<<(CMessage& msg,CAttribute& type) 59 56 { 60 57 msg.push(type) ; … … 62 59 } 63 60 64 CMessage& operator<<(CMessage& msg, const tree::CAttribute& type)61 CMessage& operator<<(CMessage& msg, const CAttribute& type) 65 62 { 66 63 msg.push(*type.duplicate()) ; … … 68 65 } 69 66 70 CBufferOut& operator<<(CBufferOut& buffer, tree::CAttribute& type)67 CBufferOut& operator<<(CBufferOut& buffer, CAttribute& type) 71 68 { 72 69 73 if (!type.toBuffer(buffer)) ERROR("CBufferOut& operator<<(CBufferOut& buffer, tree::CAttribute& type)",70 if (!type.toBuffer(buffer)) ERROR("CBufferOut& operator<<(CBufferOut& buffer, CAttribute& type)", 74 71 <<"Buffer remain size is to low for size type") ; 75 72 return buffer ; 76 73 } 77 74 78 CBufferIn& operator>>(CBufferIn& buffer, tree::CAttribute& type)75 CBufferIn& operator>>(CBufferIn& buffer, CAttribute& type) 79 76 { 80 77 81 if (!type.fromBuffer(buffer)) ERROR("CBufferInt& operator>>(CBufferIn& buffer, tree::CAttribute& type)",78 if (!type.fromBuffer(buffer)) ERROR("CBufferInt& operator>>(CBufferIn& buffer, CAttribute& type)", 82 79 <<"Buffer remain size is to low for size type") ; 83 80 return buffer ; -
XIOS/trunk/src/attribute.hpp
r335 r345 15 15 namespace xios 16 16 { 17 namespace tree18 {19 17 /// ////////////////////// Déclarations ////////////////////// /// 20 18 class CAttribute : public CObject, public CBaseType … … 99 97 } 100 98 101 } // namespace tree102 99 103 CMessage& operator<<(CMessage& msg, tree::CAttribute& type) ;104 CMessage& operator<<(CMessage& msg, const tree::CAttribute& type) ;100 CMessage& operator<<(CMessage& msg,CAttribute& type) ; 101 CMessage& operator<<(CMessage& msg, const CAttribute& type) ; 105 102 106 CBufferOut& operator<<(CBufferOut& buffer, tree::CAttribute& type) ;107 CBufferIn& operator>>(CBufferIn& buffer, tree::CAttribute& type) ;103 CBufferOut& operator<<(CBufferOut& buffer,CAttribute& type) ; 104 CBufferIn& operator>>(CBufferIn& buffer, CAttribute& type) ; 108 105 } 109 106 // namespace xios -
XIOS/trunk/src/attribute_map.cpp
r335 r345 4 4 namespace xios 5 5 { 6 namespace tree7 {8 6 /// ////////////////////// Définitions ////////////////////// /// 9 7 CAttributeMap * CAttributeMap::Current = NULL; … … 534 532 535 533 536 } // namespace tree537 534 } // namespace xmlioser -
XIOS/trunk/src/attribute_map.hpp
r335 r345 11 11 namespace xios 12 12 { 13 namespace tree14 {15 13 /// ////////////////////// Déclarations ////////////////////// /// 16 14 class CAttributeMap … … 69 67 }; // class CAttributeMap 70 68 71 } // namespace tree72 69 } // namespace xios 73 70 -
XIOS/trunk/src/attribute_template.cpp
r335 r345 6 6 namespace xios 7 7 { 8 namespace tree9 {10 8 /// ////////////////////// Définitions ////////////////////// /// 11 9 … … 216 214 217 215 ///-------------------------------------------------------------- 218 } // namespace tree219 216 } // namespace xios -
XIOS/trunk/src/attribute_template.hpp
r335 r345 16 16 namespace xios 17 17 { 18 namespace tree19 {20 18 /// ////////////////////// Déclarations ////////////////////// /// 21 19 template <class T> … … 81 79 }; // class CAttribute 82 80 83 } // namespace tree84 81 85 82 template <class T> void FromBinary(StdIStream & is, T & obj); -
XIOS/trunk/src/attribute_template_impl.hpp
r335 r345 13 13 { 14 14 15 namespace tree16 {17 15 /// ////////////////////// Définitions ////////////////////// /// 18 16 template <class T> … … 293 291 294 292 ///-------------------------------------------------------------- 295 } // namespace tree296 293 } // namespace xios 297 294 -
XIOS/trunk/src/client.cpp
r342 r345 130 130 { 131 131 CObjectFactory::SetCurrentContextId(id); 132 shared_ptr<CContext> context= tree::CTreeManager::CreateContext(id) ;132 shared_ptr<CContext> context=CTreeManager::CreateContext(id) ; 133 133 134 134 if (!CXios::isServer) -
XIOS/trunk/src/context_client.cpp
r335 r345 15 15 16 16 17 CContextClient::CContextClient( tree::CContext* parent,MPI_Comm intraComm_, MPI_Comm interComm_)17 CContextClient::CContextClient(CContext* parent,MPI_Comm intraComm_, MPI_Comm interComm_) 18 18 { 19 19 context=parent ; -
XIOS/trunk/src/context_client.hpp
r335 r345 10 10 namespace xios 11 11 { 12 namespace tree 13 { 14 class CContext ; 15 } 12 class CContext ; 16 13 17 14 class CContextClient … … 19 16 20 17 public: 21 CContextClient( tree::CContext* parent,MPI_Comm intraComm, MPI_Comm interComm) ;18 CContextClient(CContext* parent,MPI_Comm intraComm, MPI_Comm interComm) ; 22 19 // void registerEvent(CEventClient& event) ; 23 20 … … 44 41 void waitEvent(list<int>& ranks) ; 45 42 46 tree::CContext* context ;43 CContext* context ; 47 44 // bool locked ; 48 45 -
XIOS/trunk/src/context_server.cpp
r335 r345 16 16 { 17 17 18 CContextServer::CContextServer( tree::CContext* parent,MPI_Comm intraComm_,MPI_Comm interComm_)18 CContextServer::CContextServer(CContext* parent,MPI_Comm intraComm_,MPI_Comm interComm_) 19 19 { 20 20 context=parent ; … … 167 167 int rank ; 168 168 list<CEventServer::SSubEvent>::iterator it ; 169 tree::CTreeManager::SetCurrentContextId(context->getId()) ;169 CTreeManager::SetCurrentContextId(context->getId()) ; 170 170 171 171 if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_FINALIZE) -
XIOS/trunk/src/context_server.hpp
r335 r345 8 8 namespace xios 9 9 { 10 namespace tree 11 { 12 class CContext ; 13 } 10 class CContext ; 14 11 15 12 class CContextServer … … 17 14 public: 18 15 19 CContextServer( tree::CContext* parent,MPI_Comm intraComm,MPI_Comm interComm) ;16 CContextServer(CContext* parent,MPI_Comm intraComm,MPI_Comm interComm) ; 20 17 bool eventLoop(void) ; 21 18 void listen(void) ; … … 40 37 map<size_t,CEventServer*> events ; 41 38 size_t currentTimeLine ; 42 tree::CContext* context ;39 CContext* context ; 43 40 44 41 bool finished ; -
XIOS/trunk/src/cxios.cpp
r342 r345 25 25 void CXios::initialize() 26 26 { 27 tree::CTreeManager::ParseFile(rootFile);27 CTreeManager::ParseFile(rootFile); 28 28 usingServer=getin<bool>("using_server",false) ; 29 29 usingOasis=getin<bool>("using_oasis",false) ; -
XIOS/trunk/src/data_output.cpp
r343 r345 15 15 16 16 void CDataOutput::writeGrid 17 (const boost::shared_ptr< tree::CGrid> grid)17 (const boost::shared_ptr<CGrid> grid) 18 18 { 19 19 if (grid->domain_ref.isEmpty()) … … 24 24 { 25 25 this->writeGrid 26 (CObjectFactory::GetObject< tree::CDomain>(grid->domain_ref.getValue()));26 (CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue())); 27 27 } 28 28 else 29 29 { 30 30 this->writeGrid 31 (CObjectFactory::GetObject< tree::CDomain>(grid->domain_ref.getValue()),32 CObjectFactory::GetObject< tree::CAxis>(grid->axis_ref.getValue()));31 (CObjectFactory::GetObject<CDomain>(grid->domain_ref.getValue()), 32 CObjectFactory::GetObject<CAxis>(grid->axis_ref.getValue())); 33 33 } 34 34 } … … 37 37 38 38 void CDataOutput::writeFile 39 (const boost::shared_ptr< tree::CFile> file)39 (const boost::shared_ptr<CFile> file) 40 40 { 41 41 this->writeFile_(file); … … 55 55 56 56 void CDataOutput::writeGrid 57 (const boost::shared_ptr< tree::CDomain> domain,58 const boost::shared_ptr< tree::CAxis> axis)57 (const boost::shared_ptr<CDomain> domain, 58 const boost::shared_ptr<CAxis> axis) 59 59 { 60 60 this->writeDomain_(domain); … … 65 65 66 66 void CDataOutput::writeGrid 67 (const boost::shared_ptr< tree::CDomain> domain)67 (const boost::shared_ptr<CDomain> domain) 68 68 { 69 69 this->writeDomain_(domain); … … 73 73 74 74 void CDataOutput::writeField 75 (const boost::shared_ptr< tree::CField> field)75 (const boost::shared_ptr<CField> field) 76 76 { 77 boost::shared_ptr< tree::CContext> context =78 CObjectFactory::GetObject< tree::CContext>(CObjectFactory::GetCurrentContextId());77 boost::shared_ptr<CContext> context = 78 CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()); 79 79 boost::shared_ptr<CCalendar> calendar = context->getCalendar(); 80 80 … … 86 86 87 87 void CDataOutput::writeFieldGrid 88 (const boost::shared_ptr< tree::CField> field)88 (const boost::shared_ptr<CField> field) 89 89 { 90 90 this->writeGrid(field->getRelGrid()); … … 93 93 //---------------------------------------------------------------- 94 94 95 void CDataOutput::writeFieldData(const boost::shared_ptr< tree::CField> field)95 void CDataOutput::writeFieldData(const boost::shared_ptr<CField> field) 96 96 { 97 97 boost::shared_ptr<CGrid> grid = -
XIOS/trunk/src/data_output.hpp
r343 r345 23 23 24 24 /// Ecriture /// 25 void writeFile (const boost::shared_ptr< tree::CFile> file);25 void writeFile (const boost::shared_ptr<CFile> file); 26 26 void syncFile (void); 27 27 void closeFile (void); 28 void writeField (const boost::shared_ptr< tree::CField> field);29 void writeFieldGrid(const boost::shared_ptr< tree::CField> field);30 void writeFieldData(const boost::shared_ptr< tree::CField> field);28 void writeField (const boost::shared_ptr<CField> field); 29 void writeFieldGrid(const boost::shared_ptr<CField> field); 30 void writeFieldData(const boost::shared_ptr<CField> field); 31 31 32 32 virtual void definition_start(void) = 0; … … 38 38 39 39 /// Ecriture /// 40 void writeGrid(const boost::shared_ptr< tree::CGrid> grid);41 void writeGrid(const boost::shared_ptr< tree::CDomain> domain,42 const boost::shared_ptr< tree::CAxis> axis);43 void writeGrid(const boost::shared_ptr< tree::CDomain> domain);40 void writeGrid(const boost::shared_ptr<CGrid> grid); 41 void writeGrid(const boost::shared_ptr<CDomain> domain, 42 const boost::shared_ptr<CAxis> axis); 43 void writeGrid(const boost::shared_ptr<CDomain> domain); 44 44 45 virtual void writeFile_ (const boost::shared_ptr< tree::CFile> file) = 0;45 virtual void writeFile_ (const boost::shared_ptr<CFile> file) = 0; 46 46 virtual void closeFile_ (void) = 0; 47 47 virtual void syncFile_ (void) = 0; 48 virtual void writeField_ (const boost::shared_ptr< tree::CField> field) = 0;49 virtual void writeFieldData_ (const boost::shared_ptr< tree::CField> field) = 0;50 virtual void writeDomain_ (const boost::shared_ptr< tree::CDomain> domain) = 0;51 virtual void writeAxis_ (const boost::shared_ptr< tree::CAxis> axis) = 0;52 virtual void writeTimeAxis_ (const boost::shared_ptr< tree::CField> field,48 virtual void writeField_ (const boost::shared_ptr<CField> field) = 0; 49 virtual void writeFieldData_ (const boost::shared_ptr<CField> field) = 0; 50 virtual void writeDomain_ (const boost::shared_ptr<CDomain> domain) = 0; 51 virtual void writeAxis_ (const boost::shared_ptr<CAxis> axis) = 0; 52 virtual void writeTimeAxis_ (const boost::shared_ptr<CField> field, 53 53 const boost::shared_ptr<CCalendar> cal) = 0; 54 54 -
XIOS/trunk/src/field_impl.hpp
r343 r345 10 10 11 11 namespace xios { 12 namespace tree {13 12 14 13 template <StdSize N> … … 60 59 } 61 60 62 } // namespace tree63 61 } // namespace xios 64 62 -
XIOS/trunk/src/generate_fortran_interface.cpp
r313 r345 11 11 string path="./interface/" ; 12 12 13 CContext* context= tree::CTreeManager::CreateContext("interface").get();13 CContext* context=CTreeManager::CreateContext("interface").get(); 14 14 CAxis axis ; 15 15 CAxisGroup axisgroup ; -
XIOS/trunk/src/group_template.hpp
r335 r345 9 9 namespace xios 10 10 { 11 using namespace tree;12 11 13 12 /// ////////////////////// Déclarations ////////////////////// /// -
XIOS/trunk/src/group_template_impl.hpp
r335 r345 13 13 namespace xios 14 14 { 15 using namespace tree;16 15 17 16 /// ////////////////////// Définitions ////////////////////// /// … … 44 43 const StdSize grpnb = this->groupList.size(); 45 44 const StdSize chdnb = this->childList.size(); 46 tree::ENodeType cenum = U::GetType();47 tree::ENodeType genum = V::GetType();45 ENodeType cenum = U::GetType(); 46 ENodeType genum = V::GetType(); 48 47 49 48 os.write (reinterpret_cast<const char*>(&grpnb) , sizeof(StdSize)); … … 60 59 bool hid = group->hasId(); 61 60 62 os.write (reinterpret_cast<const char*>(&genum), sizeof( tree::ENodeType));61 os.write (reinterpret_cast<const char*>(&genum), sizeof(ENodeType)); 63 62 os.write (reinterpret_cast<const char*>(&hid), sizeof(bool)); 64 63 … … 79 78 bool hid = child->hasId(); 80 79 81 os.write (reinterpret_cast<const char*>(&cenum), sizeof( tree::ENodeType));80 os.write (reinterpret_cast<const char*>(&cenum), sizeof(ENodeType)); 82 81 os.write (reinterpret_cast<const char*>(&hid), sizeof(bool)); 83 82 … … 106 105 StdSize grpnb = 0; 107 106 StdSize chdnb = 0; 108 tree::ENodeType renum = Unknown;107 ENodeType renum = Unknown; 109 108 110 109 is.read (reinterpret_cast<char*>(&grpnb), sizeof(StdSize)); … … 114 113 { 115 114 bool hid = false; 116 is.read (reinterpret_cast<char*>(&renum), sizeof( tree::ENodeType));115 is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType)); 117 116 is.read (reinterpret_cast<char*>(&hid), sizeof(bool)); 118 117 … … 138 137 { 139 138 bool hid = false; 140 is.read (reinterpret_cast<char*>(&renum), sizeof( tree::ENodeType));139 is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType)); 141 140 is.read (reinterpret_cast<char*>(&hid), sizeof(bool)); 142 141 -
XIOS/trunk/src/interface/c/icaxis.cpp
r335 r345 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef xios:: tree::CAxis * XAxisPtr;23 typedef xios:: tree::CAxisGroup * XAxisGroupPtr;22 typedef xios::CAxis * XAxisPtr; 23 typedef xios::CAxisGroup * XAxisGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CAxis>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::CAxis>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CAxisGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::CAxisGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CAxis>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::CAxis>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CAxisGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::CAxisGroup>(id); 59 59 } 60 60 -
XIOS/trunk/src/interface/c/iccontext.cpp
r335 r345 24 24 typedef enum { D360 = 0 , ALLLEAP, NOLEAP, JULIAN, GREGORIAN } XCalendarType ; 25 25 26 typedef xios:: tree::CContext * XContextPtr;26 typedef xios::CContext * XContextPtr; 27 27 28 28 // ------------------------ Création des handle ----------------------------- … … 33 33 if (!cstr2string(_id, _id_len, id)) return; 34 34 35 std::vector<boost::shared_ptr<xios:: tree::CContext> > def_vector =36 xios:: tree::CContext::GetContextGroup()->getChildList();35 std::vector<boost::shared_ptr<xios::CContext> > def_vector = 36 xios::CContext::GetContextGroup()->getChildList(); 37 37 38 38 for (std::size_t i = 0; i < def_vector.size(); i++) … … 60 60 if (!cstr2string(_id, _id_len, id)) return; 61 61 62 std::vector<boost::shared_ptr<xios:: tree::CContext> > def_vector =63 xios:: tree::CContext::GetContextGroup()->getChildList();62 std::vector<boost::shared_ptr<xios::CContext> > def_vector = 63 xios::CContext::GetContextGroup()->getChildList(); 64 64 65 65 for (std::size_t i = 0; i < def_vector.size(); i++) -
XIOS/trunk/src/interface/c/icdata.cpp
r342 r345 31 31 typedef enum { NETCDF4 = 0 } XFileType; 32 32 33 typedef xios:: tree::CContext * XContextPtr;33 typedef xios::CContext * XContextPtr; 34 34 35 35 // -------------------- Traitement des données ------------------------------ -
XIOS/trunk/src/interface/c/icdate.cpp
r343 r345 26 26 { 27 27 CDuration dur = {ts_year, ts_month, ts_day, ts_hour, ts_minute, ts_second}; 28 boost::shared_ptr<xios:: tree::CContext> context =29 xios::CObjectFactory::GetObject<xios:: tree::CContext>28 boost::shared_ptr<xios::CContext> context = 29 xios::CObjectFactory::GetObject<xios::CContext> 30 30 (CObjectFactory::GetCurrentContextId()); 31 31 … … 42 42 void cxios_update_calendar(int step) 43 43 { 44 boost::shared_ptr<xios:: tree::CContext> context =45 xios::CObjectFactory::GetObject<xios:: tree::CContext>44 boost::shared_ptr<xios::CContext> context = 45 xios::CObjectFactory::GetObject<xios::CContext> 46 46 (CObjectFactory::GetCurrentContextId()); 47 47 context->updateCalendar(step) ; -
XIOS/trunk/src/interface/c/icdomain.cpp
r335 r345 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef xios:: tree::CDomain * XDomainPtr;23 typedef xios:: tree::CDomainGroup * XDomainGroupPtr;22 typedef xios::CDomain * XDomainPtr; 23 typedef xios::CDomainGroup * XDomainGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CDomain>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::CDomain>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CDomainGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::CDomainGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CDomain>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::CDomain>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CDomainGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::CDomainGroup>(id); 59 59 } 60 60 } // extern "C" -
XIOS/trunk/src/interface/c/icfield.cpp
r335 r345 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef xios:: tree::CField * XFieldPtr;23 typedef xios:: tree::CFieldGroup * XFieldGroupPtr;22 typedef xios::CField * XFieldPtr; 23 typedef xios::CFieldGroup * XFieldGroupPtr; 24 24 25 25 // -------------------------------------------------------------------------- … … 32 32 if (!cstr2string(_id, _id_len, id)) return; 33 33 34 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CField>(id).get();34 *_ret = xios::CObjectFactory::GetObject<xios::CField>(id).get(); 35 35 } 36 36 … … 40 40 if (!cstr2string(_id, _id_len, id)) return; 41 41 42 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CFieldGroup>(id).get();42 *_ret = xios::CObjectFactory::GetObject<xios::CFieldGroup>(id).get(); 43 43 } 44 44 … … 51 51 if (!cstr2string(_id, _id_len, id)) return; 52 52 53 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CField>(id);53 *_ret = xios::CObjectFactory::HasObject<xios::CField>(id); 54 54 } 55 55 … … 59 59 if (!cstr2string(_id, _id_len, id)) return; 60 60 61 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CFieldGroup>(id);61 *_ret = xios::CObjectFactory::HasObject<xios::CFieldGroup>(id); 62 62 } 63 63 -
XIOS/trunk/src/interface/c/icfile.cpp
r335 r345 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef xios:: tree::CFile * XFilePtr;23 typedef xios:: tree::CFileGroup * XFileGroupPtr;22 typedef xios::CFile * XFilePtr; 23 typedef xios::CFileGroup * XFileGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CFile>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::CFile>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CFileGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::CFileGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CFile>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::CFile>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CFileGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::CFileGroup>(id); 59 59 } 60 60 } // extern "C" -
XIOS/trunk/src/interface/c/icgrid.cpp
r335 r345 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef xios:: tree::CGrid * XGridPtr;23 typedef xios:: tree::CGridGroup * XGridGroupPtr;22 typedef xios::CGrid * XGridPtr; 23 typedef xios::CGridGroup * XGridGroupPtr; 24 24 25 25 // ------------------------ Création des handle ----------------------------- … … 30 30 if (!cstr2string(_id, _id_len, id)) return; 31 31 32 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CGrid>(id).get();32 *_ret = xios::CObjectFactory::GetObject<xios::CGrid>(id).get(); 33 33 } 34 34 … … 38 38 if (!cstr2string(_id, _id_len, id)) return; 39 39 40 *_ret = xios::CObjectFactory::GetObject<xios:: tree::CGridGroup>(id).get();40 *_ret = xios::CObjectFactory::GetObject<xios::CGridGroup>(id).get(); 41 41 } 42 42 … … 48 48 if (!cstr2string(_id, _id_len, id)) return; 49 49 50 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CGrid>(id);50 *_ret = xios::CObjectFactory::HasObject<xios::CGrid>(id); 51 51 } 52 52 … … 56 56 if (!cstr2string(_id, _id_len, id)) return; 57 57 58 *_ret = xios::CObjectFactory::HasObject<xios:: tree::CGridGroup>(id);58 *_ret = xios::CObjectFactory::HasObject<xios::CGridGroup>(id); 59 59 } 60 60 } // extern "C" -
XIOS/trunk/src/interface/c/icxml_tree.cpp
r335 r345 20 20 // ----------------------- Redéfinition de types ---------------------------- 21 21 22 typedef xios:: tree::CContext * XContextPtr;23 24 typedef xios:: tree::CGrid * XGridPtr;25 typedef xios:: tree::CGridGroup * XGridGroupPtr;26 27 typedef xios:: tree::CFile * XFilePtr;28 typedef xios:: tree::CFileGroup * XFileGroupPtr;29 30 typedef xios:: tree::CField * XFieldPtr;31 typedef xios:: tree::CFieldGroup * XFieldGroupPtr;32 33 typedef xios:: tree::CDomain * XDomainPtr;34 typedef xios:: tree::CDomainGroup * XDomainGroupPtr;35 36 typedef xios:: tree::CAxis * XAxisPtr;37 typedef xios:: tree::CAxisGroup * XAxisGroupPtr;22 typedef xios::CContext * XContextPtr; 23 24 typedef xios::CGrid * XGridPtr; 25 typedef xios::CGridGroup * XGridGroupPtr; 26 27 typedef xios::CFile * XFilePtr; 28 typedef xios::CFileGroup * XFileGroupPtr; 29 30 typedef xios::CField * XFieldPtr; 31 typedef xios::CFieldGroup * XFieldGroupPtr; 32 33 typedef xios::CDomain * XDomainPtr; 34 typedef xios::CDomainGroup * XDomainGroupPtr; 35 36 typedef xios::CAxis * XAxisPtr; 37 typedef xios::CAxisGroup * XAxisGroupPtr; 38 38 39 39 // ----------------------- Ajout d'enfant à un parent ----------------------- -
XIOS/trunk/src/interface/c_attr/icaxis_attr.cpp
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CAxis* axis_Ptr;15 typedef xios::CAxis* axis_Ptr; 16 16 17 17 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
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CAxisGroup* axisgroup_Ptr;15 typedef xios::CAxisGroup* axisgroup_Ptr; 16 16 17 17 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
r336 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CContext* context_Ptr;15 typedef xios::CContext* context_Ptr; 16 16 17 17 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
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CDomain* domain_Ptr;15 typedef xios::CDomain* domain_Ptr; 16 16 17 17 void cxios_set_domain_data_dim(domain_Ptr domain_hdl, int data_dim) -
XIOS/trunk/src/interface/c_attr/icdomaingroup_attr.cpp
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CDomainGroup* domaingroup_Ptr;15 typedef xios::CDomainGroup* domaingroup_Ptr; 16 16 17 17 void cxios_set_domaingroup_data_dim(domaingroup_Ptr domaingroup_hdl, int data_dim) -
XIOS/trunk/src/interface/c_attr/icfield_attr.cpp
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CField* field_Ptr;15 typedef xios::CField* field_Ptr; 16 16 17 17 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
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CFieldGroup* fieldgroup_Ptr;15 typedef xios::CFieldGroup* fieldgroup_Ptr; 16 16 17 17 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
r336 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CFile* file_Ptr;15 typedef xios::CFile* file_Ptr; 16 16 17 17 void cxios_set_file_description(file_Ptr file_hdl, const char * description, int description_size) -
XIOS/trunk/src/interface/c_attr/icfilegroup_attr.cpp
r336 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CFileGroup* filegroup_Ptr;15 typedef xios::CFileGroup* filegroup_Ptr; 16 16 17 17 void cxios_set_filegroup_description(filegroup_Ptr filegroup_hdl, const char * description, int description_size) -
XIOS/trunk/src/interface/c_attr/icgrid_attr.cpp
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CGrid* grid_Ptr;15 typedef xios::CGrid* grid_Ptr; 16 16 17 17 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
r335 r345 13 13 extern "C" 14 14 { 15 typedef xios:: tree::CGridGroup* gridgroup_Ptr;15 typedef xios::CGridGroup* gridgroup_Ptr; 16 16 17 17 void cxios_set_gridgroup_axis_ref(gridgroup_Ptr gridgroup_hdl, const char * axis_ref, int axis_ref_size) -
XIOS/trunk/src/manager/tree_manager.cpp
r335 r345 7 7 namespace xios 8 8 { 9 namespace tree10 {11 9 /// ////////////////////// Définitions ////////////////////// /// 12 10 … … 23 21 bool hasctxt = CObjectFactory::HasObject<CContext>(id); 24 22 25 boost::shared_ptr< tree::CContext> context =26 CObjectFactory::CreateObject< tree::CContext>(id);23 boost::shared_ptr<CContext> context = 24 CObjectFactory::CreateObject<CContext>(id); 27 25 if (!hasctxt) CGroupFactory::AddChild(group_context, context); 28 26 … … 46 44 { 47 45 StdOStringStream ostrstream; 48 tree::CContext::ShowTree(ostrstream);46 CContext::ShowTree(ostrstream); 49 47 content.assign(CIndentedXml::Indented(ostrstream.str())); 50 48 } … … 53 51 { 54 52 StdOStringStream ostrstream; 55 tree::CContext::ShowTree(ostrstream);53 CContext::ShowTree(ostrstream); 56 54 out << CIndentedXml::Indented(ostrstream.str()); 57 55 } … … 133 131 { 134 132 bool hid = false; 135 is.read (reinterpret_cast<char*>(&renum), sizeof( tree::ENodeType));133 is.read (reinterpret_cast<char*>(&renum), sizeof(ENodeType)); 136 134 is.read (reinterpret_cast<char*>(&hid), sizeof(bool)); 137 135 … … 395 393 ///------------------------------------------------------------- 396 394 397 } // namespace tree398 395 } // namespace xios -
XIOS/trunk/src/manager/tree_manager.hpp
r335 r345 13 13 namespace xios 14 14 { 15 namespace tree16 {17 15 /// ////////////////////// Déclarations ////////////////////// /// 18 16 class CTreeManager … … 50 48 }; // class CTreeManager 51 49 52 } // namespace tree53 50 } // namespace xios 54 51 -
XIOS/trunk/src/node/axis.cpp
r335 r345 6 6 7 7 namespace xios { 8 namespace tree {9 8 10 9 /// ////////////////////// Définitions ////////////////////// /// … … 62 61 ///--------------------------------------------------------------- 63 62 64 } // namespace tree65 63 } // namespace xios -
XIOS/trunk/src/node/axis.hpp
r335 r345 9 9 10 10 namespace xios { 11 namespace tree {12 11 13 12 /// ////////////////////// Déclarations ////////////////////// /// … … 81 80 ///-------------------------------------------------------------- 82 81 83 } // namespace tree84 82 } // namespace xios 85 83 -
XIOS/trunk/src/node/context.cpp
r344 r345 14 14 15 15 namespace xios { 16 namespace tree {17 16 18 17 /// ////////////////////// Définitions ////////////////////// /// … … 547 546 } 548 547 549 } // namespace tree550 548 } // namespace xios -
XIOS/trunk/src/node/context.hpp
r344 r345 19 19 class CContextServer ; 20 20 21 namespace tree {22 21 23 22 /// ////////////////////// Déclarations ////////////////////// /// … … 155 154 ///-------------------------------------------------------------- 156 155 157 } // namespace tree158 156 } // namespace xios 159 157 -
XIOS/trunk/src/node/domain.cpp
r335 r345 12 12 13 13 namespace xios { 14 namespace tree {15 14 16 15 /// ////////////////////// Définitions ////////////////////// /// … … 1068 1067 ///--------------------------------------------------------------- 1069 1068 1070 } // namespace tree1071 1069 } // namespace xios -
XIOS/trunk/src/node/domain.hpp
r335 r345 12 12 13 13 namespace xios { 14 namespace tree {15 14 16 15 /// ////////////////////// Déclarations ////////////////////// /// … … 164 163 ///-------------------------------------------------------------- 165 164 166 } // namespace tree167 165 } // namespace xios 168 166 -
XIOS/trunk/src/node/field.cpp
r343 r345 9 9 10 10 namespace xios{ 11 namespace tree {12 11 13 12 /// ////////////////////// Définitions ////////////////////// /// … … 506 505 } 507 506 508 } // namespace tree509 507 510 508 ///------------------------------------------------------------------- -
XIOS/trunk/src/node/field.hpp
r343 r345 15 15 16 16 namespace xios { 17 namespace tree {18 17 19 18 /// ////////////////////// Déclarations ////////////////////// /// … … 156 155 DECLARE_GROUP(CField); 157 156 158 } // namespace tree159 160 157 ///----------------------------------------------------------------- 161 158 -
XIOS/trunk/src/node/file.cpp
r343 r345 16 16 17 17 namespace xios { 18 namespace tree {19 18 20 19 /// ////////////////////// Définitions ////////////////////// /// … … 501 500 ///--------------------------------------------------------------- 502 501 503 } // namespace tree504 502 } // namespace xios -
XIOS/trunk/src/node/file.hpp
r343 r345 12 12 13 13 namespace xios { 14 namespace tree {15 14 16 15 /// ////////////////////// Déclarations ////////////////////// /// … … 131 130 ///-------------------------------------------------------------- 132 131 133 } // namespace tree134 132 } // namespace xios 135 133 -
XIOS/trunk/src/node/grid.cpp
r335 r345 8 8 9 9 namespace xios { 10 namespace tree {11 10 12 11 /// ////////////////////// Définitions ////////////////////// /// … … 699 698 ///--------------------------------------------------------------- 700 699 701 } // namespace tree702 700 } // namespace xios -
XIOS/trunk/src/node/grid.hpp
r335 r345 11 11 12 12 namespace xios { 13 namespace tree {14 13 15 14 /// ////////////////////// Déclarations ////////////////////// /// … … 178 177 ///-------------------------------------------------------------- 179 178 180 } // namespace tree181 179 } // namespace xios 182 180 -
XIOS/trunk/src/node/method.hpp
r335 r345 4 4 namespace xios 5 5 { 6 namespace tree7 {8 6 /// ////////////////////// Déclarations ////////////////////// /// 9 7 … … 97 95 StdString CMethod::GetDefName(void){ return (CMethod::GetName()); } 98 96 99 } // namespace tree100 97 } // namespace xios 101 98 -
XIOS/trunk/src/node/node_enum.hpp
r335 r345 7 7 namespace xios 8 8 { 9 namespace tree10 {11 9 /// ////////////////////// Définitions ////////////////////// /// 12 10 typedef enum _node_type … … 25 23 } ENodeType; 26 24 27 } // namespace tree28 25 } // namespace xios 29 26 -
XIOS/trunk/src/node/var.hpp
r335 r345 4 4 namespace xios 5 5 { 6 namespace tree7 {8 6 /// ////////////////////// Déclarations ////////////////////// /// 9 7 … … 97 95 StdString CVar::GetDefName(void){ return (CVar::GetName()); } 98 96 99 } // namespace tree100 97 } // namespace xios 101 98 -
XIOS/trunk/src/node/variable.cpp
r335 r345 9 9 10 10 namespace xios { 11 namespace tree {12 11 13 12 /// ////////////////////// Définitions ////////////////////// /// … … 113 112 } 114 113 115 } // namespace tree116 114 } // namespace xios -
XIOS/trunk/src/node/variable.hpp
r335 r345 10 10 namespace xios 11 11 { 12 namespace tree13 {14 12 /// ////////////////////// Déclarations ////////////////////// /// 15 13 … … 112 110 113 111 114 } // namespace tree115 112 } // namespace xios 116 113 -
XIOS/trunk/src/object_template.hpp
r335 r345 16 16 class CObjectTemplate 17 17 : public CObject 18 , public virtual tree::CAttributeMap18 , public virtual CAttributeMap 19 19 { 20 20 … … 23 23 24 24 /// Typedef /// 25 typedef tree::CAttributeMap SuperClassMap;25 typedef CAttributeMap SuperClassMap; 26 26 typedef CObject SuperClass; 27 27 typedef T DerivedType; … … 44 44 45 45 /// Accesseurs /// 46 tree::ENodeType getType(void) const;46 ENodeType getType(void) const; 47 47 48 48 /// Test /// … … 55 55 static void ClearAllAttributes(void); 56 56 void sendAttributToServer(const string& id); 57 void sendAttributToServer( tree::CAttribute& attr) ;57 void sendAttributToServer(CAttribute& attr) ; 58 58 static void recvAttributFromClient(CEventServer& event) ; 59 59 static bool dispatchEvent(CEventServer& event) ; -
XIOS/trunk/src/object_template_impl.hpp
r335 r345 33 33 template <class T> 34 34 CObjectTemplate<T>::CObjectTemplate(void) 35 : tree::CAttributeMap()35 : CAttributeMap() 36 36 , CObject() 37 37 { /* Ne rien faire de plus */ } … … 39 39 template <class T> 40 40 CObjectTemplate<T>::CObjectTemplate(const StdString & id) 41 : tree::CAttributeMap()41 : CAttributeMap() 42 42 , CObject(id) 43 43 { /* Ne rien faire de plus */ } … … 46 46 CObjectTemplate<T>::CObjectTemplate 47 47 (const CObjectTemplate<T> & object, bool withAttrList, bool withId) 48 : tree::CAttributeMap()48 : CAttributeMap() 49 49 , CObject() 50 50 { … … 113 113 114 114 template <class T> 115 tree::ENodeType CObjectTemplate<T>::getType(void) const115 ENodeType CObjectTemplate<T>::getType(void) const 116 116 { 117 117 return (T::GetType()); … … 166 166 167 167 template <class T> 168 void CObjectTemplate<T>::sendAttributToServer( tree::CAttribute& attr)168 void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr) 169 169 { 170 170 shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ; … … 270 270 oss<<"extern \"C\""<<iendl ; 271 271 oss<<"{"<<iendl++ ; 272 oss<<"typedef xios:: tree::"<<getStrType<T>()<<"* "<<className<<"_Ptr;"<<iendl;272 oss<<"typedef xios::"<<getStrType<T>()<<"* "<<className<<"_Ptr;"<<iendl; 273 273 oss<<iendl ; 274 274 SuperClassMap::generateCInterface(oss,className) ; -
XIOS/trunk/src/output/nc4_data_output.cpp
r343 r345 55 55 //--------------------------------------------------------------- 56 56 57 void CNc4DataOutput::writeDomain_(const boost::shared_ptr< tree::CDomain> domain)57 void CNc4DataOutput::writeDomain_(const boost::shared_ptr<CDomain> domain) 58 58 { 59 59 shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ; … … 221 221 //-------------------------------------------------------------- 222 222 223 void CNc4DataOutput::writeAxis_(const boost::shared_ptr< tree::CAxis> axis)223 void CNc4DataOutput::writeAxis_(const boost::shared_ptr<CAxis> axis) 224 224 { 225 225 if (axis->IsWritten(this->filename)) return; … … 269 269 //-------------------------------------------------------------- 270 270 271 void CNc4DataOutput::writeField_(const boost::shared_ptr< tree::CField> field)271 void CNc4DataOutput::writeField_(const boost::shared_ptr<CField> field) 272 272 { 273 273 shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ; … … 418 418 //-------------------------------------------------------------- 419 419 420 void CNc4DataOutput::writeFile_ (const boost::shared_ptr< tree::CFile> file)420 void CNc4DataOutput::writeFile_ (const boost::shared_ptr<CFile> file) 421 421 { 422 422 StdString filename = (!file->name.isEmpty()) … … 461 461 //--------------------------------------------------------------- 462 462 463 void CNc4DataOutput::writeFieldData_ (const boost::shared_ptr< tree::CField> field)463 void CNc4DataOutput::writeFieldData_ (const boost::shared_ptr<CField> field) 464 464 { 465 465 shared_ptr<CContext> context=CObjectFactory::GetObject<CContext>(CObjectFactory::GetCurrentContextId()) ; … … 561 561 562 562 void CNc4DataOutput::writeTimeAxis_ 563 (const boost::shared_ptr< tree::CField> field,563 (const boost::shared_ptr<CField> field, 564 564 const boost::shared_ptr<CCalendar> cal) 565 565 { -
XIOS/trunk/src/output/nc4_data_output.hpp
r343 r345 40 40 41 41 /// Ecriture /// 42 virtual void writeDomain_ (const boost::shared_ptr< tree::CDomain> domain);43 virtual void writeAxis_ (const boost::shared_ptr< tree::CAxis> axis);44 virtual void writeField_ (const boost::shared_ptr< tree::CField> field);45 virtual void writeFieldData_ (const boost::shared_ptr< tree::CField> field);46 virtual void writeFile_ (const boost::shared_ptr< tree::CFile> file);42 virtual void writeDomain_ (const boost::shared_ptr<CDomain> domain); 43 virtual void writeAxis_ (const boost::shared_ptr<CAxis> axis); 44 virtual void writeField_ (const boost::shared_ptr<CField> field); 45 virtual void writeFieldData_ (const boost::shared_ptr<CField> field); 46 virtual void writeFile_ (const boost::shared_ptr<CFile> file); 47 47 virtual void closeFile_ (void); 48 48 virtual void syncFile_ (void); 49 virtual void writeTimeAxis_ (const boost::shared_ptr< tree::CField> field,49 virtual void writeTimeAxis_ (const boost::shared_ptr<CField> field, 50 50 const boost::shared_ptr<CCalendar> cal); 51 51 -
XIOS/trunk/src/output/onetcdf4.hpp
r337 r345 83 83 84 84 /// Ecriture /// 85 virtual void writeField_ (const boost::shared_ptr< tree::CField> field) = 0;86 virtual void writeDomain_(const boost::shared_ptr< tree::CDomain> domain) = 0;87 virtual void writeAxis_ (const boost::shared_ptr< tree::CAxis> axis) = 0;85 virtual void writeField_ (const boost::shared_ptr<CField> field) = 0; 86 virtual void writeDomain_(const boost::shared_ptr<CDomain> domain) = 0; 87 virtual void writeAxis_ (const boost::shared_ptr<CAxis> axis) = 0; 88 88 89 89 /// Accesseurs /// -
XIOS/trunk/src/server.cpp
r342 r345 346 346 <<"Context has already been registred") ; 347 347 348 shared_ptr<CContext> context= tree::CTreeManager::CreateContext(contextId) ;348 shared_ptr<CContext> context=CTreeManager::CreateContext(contextId) ; 349 349 contextList[contextId]=context.get() ; 350 350 context->initServer(intraComm,contextIntercomm) ; -
XIOS/trunk/src/type/type_util.hpp
r335 r345 5 5 namespace xios 6 6 { 7 namespace tree8 {9 7 class CDomain ; 10 8 class CDomainGroup; … … 18 16 class CFileGroup; 19 17 class CContext; 20 }21 18 22 /*23 typedef tree::CDomain CDomain;24 typedef tree::CDomainGroup CDomainGroup;25 typedef tree::CField CField;26 typedef tree::CFieldGroup CFieldGroup;27 typedef tree::CGrid CGrid;28 typedef tree::CGridGroup CGridGroup;29 typedef tree::CAxis CAxis;30 typedef tree::CAxisGroup CAxisGroup;31 typedef tree::CFile CFile;32 typedef tree::CFileGroup CFileGroup;33 typedef tree::CContext CContext;34 */35 19 36 20 template <typename T> … … 54 38 #undef macro 55 39 56 #define macro(T) template <> inline string getStrType< tree::T>(void) { return std::string(#T) ; }40 #define macro(T) template <> inline string getStrType<T>(void) { return std::string(#T) ; } 57 41 macro(CDomain) 58 42 macro(CDomainGroup) -
XIOS/trunk/src/xml_parser.cpp
r335 r345 52 52 do 53 53 { 54 boost::shared_ptr< tree::CContextGroup> group_context =55 tree::CContext::GetContextGroup();54 boost::shared_ptr<CContextGroup> group_context = 55 CContext::GetContextGroup(); 56 56 attributes = node.getAttributes(); 57 57 … … 65 65 CGroupFactory::SetCurrentContextId(attributes["id"]); 66 66 67 bool hasctxt = CObjectFactory::HasObject< tree::CContext>(attributes["id"]);67 bool hasctxt = CObjectFactory::HasObject<CContext>(attributes["id"]); 68 68 69 69 if(hasctxt) … … 74 74 } 75 75 76 boost::shared_ptr< tree::CContext> context =77 CObjectFactory::CreateObject< tree::CContext>(attributes["id"]);76 boost::shared_ptr<CContext> context = 77 CObjectFactory::CreateObject<CContext>(attributes["id"]); 78 78 if (!hasctxt) CGroupFactory::AddChild(group_context, context); 79 79 context->parse(node); -
XIOS/trunk/src/xmlioserver.hpp
r337 r345 8 8 #include "nc4_data_output.hpp" 9 9 10 //#include "data_manager.hpp"11 //#include "time_manager.hpp"12 10 13 11 using namespace xios; 14 using namespace xios::data;15 using namespace xios::tree;16 12 using namespace xios::xml; 17 13 using namespace xios::func;
Note: See TracChangeset
for help on using the changeset viewer.