diff options
| author | jkinnebrew <jkinnebrew@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-06-12 20:59:07 +0000 |
|---|---|---|
| committer | jkinnebrew <jkinnebrew@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-06-12 20:59:07 +0000 |
| commit | 6bc77f7218e4c38ec83ad54de903da07e737b0f9 (patch) | |
| tree | e10ed6ac0fdfb75bdbb293a1ccce6bc4028c67bf | |
| parent | 7d6a4d04342f66306e9ed33110591230c04284c9 (diff) | |
| download | ATCD-6bc77f7218e4c38ec83ad54de903da07e737b0f9.tar.gz | |
Fri Jun 12 20:58:24 UTC 2009 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu>
| -rw-r--r-- | SA_POP/ChangeLog | 7 | ||||
| -rw-r--r-- | SA_POP/SANet/SANetFileIn.cpp | 20 | ||||
| -rw-r--r-- | SA_POP/TaskMapFileIn.cpp | 10 |
3 files changed, 25 insertions, 12 deletions
diff --git a/SA_POP/ChangeLog b/SA_POP/ChangeLog index dcd52e2f43e..18447a9eaf4 100644 --- a/SA_POP/ChangeLog +++ b/SA_POP/ChangeLog @@ -1,3 +1,10 @@ +Fri Jun 12 20:58:24 UTC 2009 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> + + * SANet/SANetFileIn.cpp: + * TaskMapFileIn.cpp: + + Modified for new CIAO XML Utilities in SA-POP Standalone. + Fri Jun 12 17:37:05 UTC 2009 John S. Kinnebrew <john.s.kinnebrew@vanderbilt.edu> diff --git a/SA_POP/SANet/SANetFileIn.cpp b/SA_POP/SANet/SANetFileIn.cpp index e72f47656af..38edf710018 100644 --- a/SA_POP/SANet/SANetFileIn.cpp +++ b/SA_POP/SANet/SANetFileIn.cpp @@ -46,11 +46,13 @@ Network *SANetFileIn::build_net (std::string filename) // Parse file with Xerces. XERCES_CPP_NAMESPACE::DOMDocument *dom = -#if defined (SA_POP_HAS_CIAO) +//*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP***** +// No longer need different call to XML Helper with/without CIAO... I think... +//#if defined (SA_POP_HAS_CIAO) XML_Helper::XML_HELPER.create_dom (filename.c_str ()); -#else - XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); -#endif /* SA_POP_HAS_CIAO */ +//#else +// XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); +//#endif /* SA_POP_HAS_CIAO */ if (!dom) return 0; @@ -156,11 +158,13 @@ void SANetFileIn::build_net (std::string filename, SA_POP::Builder *builder) // Parse file with Xerces. XERCES_CPP_NAMESPACE::DOMDocument *dom = -#if defined (SA_POP_HAS_CIAO) +//*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP***** +// No longer need different call to XML Helper with/without CIAO... I think... +//#if defined (SA_POP_HAS_CIAO) XML_Helper::XML_HELPER.create_dom (filename.c_str ()); -#else - XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); -#endif /* SA_POP_HAS_CIAO */ +//#else +// XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); +//#endif /* SA_POP_HAS_CIAO */ if (!dom) return; diff --git a/SA_POP/TaskMapFileIn.cpp b/SA_POP/TaskMapFileIn.cpp index d2f83592f46..a91a44de6e1 100644 --- a/SA_POP/TaskMapFileIn.cpp +++ b/SA_POP/TaskMapFileIn.cpp @@ -42,11 +42,13 @@ void TaskMapFileIn::build_task_map (std::string filename, Builder *builder) // Parse file with Xerces. XERCES_CPP_NAMESPACE::DOMDocument *dom = -#if defined (SA_POP_HAS_CIAO) +//*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP*****TEMP***** +// No longer need different call to XML Helper with/without CIAO... I think... +//#if defined (SA_POP_HAS_CIAO) XML_Helper::XML_HELPER.create_dom (filename.c_str ()); -#else - XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); -#endif /* SA_POP_HAS_CIAO */ +//#else +// XML_Helper::XML_HELPER.create_dom (filename.c_str (), ""); +//#endif /* SA_POP_HAS_CIAO */ if (!dom) throw "SA_POP::TaskMapFileIn::build_task_map (): Could not create Xerces DOMDocument from file"; |