1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Description: fix header paths to use system tinyxml
Author: Anton Gladky <gladk@debian.org>
Last-Update: 2015-03-28
Index: palabos-1.5.1/src/libraryInterfaces/TINYXML_xmlIO.h
===================================================================
--- palabos-1.5.1.orig/src/libraryInterfaces/TINYXML_xmlIO.h
+++ palabos-1.5.1/src/libraryInterfaces/TINYXML_xmlIO.h
@@ -32,7 +32,7 @@
#include <string>
#include <vector>
#include <map>
-#include "tinyxml/tinyxml.h"
+#include <tinyxml.h>
#include "core/array.h"
namespace plb {
Index: palabos-1.5.1/src/libraryInterfaces/TINYXML_xmlIO.cpp
===================================================================
--- palabos-1.5.1.orig/src/libraryInterfaces/TINYXML_xmlIO.cpp
+++ palabos-1.5.1/src/libraryInterfaces/TINYXML_xmlIO.cpp
@@ -82,7 +82,7 @@ void XMLreader::mainProcessorIni( std::v
std::map<plint, TiXmlNode*> parents;
for (pluint iParent=0; iParent<pParentVect.size(); ++iParent) {
PLB_PRECONDITION( pParentVect[iParent]->Type()==TiXmlNode::DOCUMENT ||
- pParentVect[iParent]->Type()==TiXmlNode::ELEMENT );
+ pParentVect[iParent]->Type()==TiXmlNode::TINYXML_ELEMENT );
TiXmlElement* pParentElement = pParentVect[iParent]->ToElement();
plint id=0;
@@ -117,11 +117,11 @@ void XMLreader::mainProcessorIni( std::v
for ( pChild = pParent->FirstChild(); pChild != 0; pChild = pChild->NextSibling())
{
int type = pChild->Type();
- if ( type==TiXmlNode::ELEMENT ) {
+ if ( type==TiXmlNode::TINYXML_ELEMENT ) {
std::string name(pChild->Value());
childMap[name].push_back(pChild);
}
- else if ( type==TiXmlNode::TEXT ) {
+ else if ( type==TiXmlNode::TINYXML_TEXT ) {
data.text = pChild->ToText()->ValueStr();
}
}
Index: palabos-1.5.1/src/palabos2D.h
===================================================================
--- palabos-1.5.1.orig/src/palabos2D.h
+++ palabos-1.5.1/src/palabos2D.h
@@ -40,5 +40,5 @@
#include <offLattice/headers2D.h>
#include <particles/headers2D.h>
#include <libraryInterfaces/headers2D.h>
-#include <tinyxml/tinyxml.h>
+#include <tinyxml.h>
|
