diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-05 11:54:34 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-05 11:54:34 -0400 |
| commit | 55a10480945f2a41fe6cfda2173bed12d3d5bc89 (patch) | |
| tree | 89fb71ecfd4a185390164a2eadec63430216707a /libs/pbd | |
| parent | 096fe04e61e0d223d829cabe1bb7fbcfc8907d18 (diff) | |
| parent | f0f26fb8d31451d7155e8eac7d6ee098bbe1a91d (diff) | |
Merge branch 'patches' of https://github.com/jdekozak/ardour
Diffstat (limited to 'libs/pbd')
| -rw-r--r-- | libs/pbd/pbd/fastlog.h | 2 | ||||
| -rw-r--r-- | libs/pbd/xml++.cc | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/libs/pbd/pbd/fastlog.h b/libs/pbd/pbd/fastlog.h index 4269705a44..9897da773a 100644 --- a/libs/pbd/pbd/fastlog.h +++ b/libs/pbd/pbd/fastlog.h @@ -35,6 +35,6 @@ static inline float fast_log10 (const float val) return fast_log2(val) / 3.312500f; } -static inline float minus_infinity() { return -HUGE_VAL; } +static inline float minus_infinity(void) { return -HUGE_VAL; } #endif /* __pbd_fastlog_h__ */ diff --git a/libs/pbd/xml++.cc b/libs/pbd/xml++.cc index 6554bed9ee..a1fa77db66 100644 --- a/libs/pbd/xml++.cc +++ b/libs/pbd/xml++.cc @@ -11,7 +11,7 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -#define XML_VERSION "1.0" +xmlChar* xml_version = xmlCharStrdup("1.0"); using namespace std; @@ -151,7 +151,7 @@ XMLTree::write() const int result; xmlKeepBlanksDefault(0); - doc = xmlNewDoc((xmlChar*) XML_VERSION); + doc = xmlNewDoc(xml_version); xmlSetDocCompressMode(doc, _compression); writenode(doc, _root, doc->children, 1); result = xmlSaveFormatFileEnc(_filename.c_str(), doc, "UTF-8", 1); @@ -171,7 +171,7 @@ XMLTree::debug(FILE* out) const XMLNodeList children; xmlKeepBlanksDefault(0); - doc = xmlNewDoc((xmlChar*) XML_VERSION); + doc = xmlNewDoc(xml_version); xmlSetDocCompressMode(doc, _compression); writenode(doc, _root, doc->children, 1); xmlDebugDumpDocument (out, doc); @@ -188,7 +188,7 @@ XMLTree::write_buffer() const XMLNodeList children; xmlKeepBlanksDefault(0); - doc = xmlNewDoc((xmlChar*) XML_VERSION); + doc = xmlNewDoc(xml_version); xmlSetDocCompressMode(doc, _compression); writenode(doc, _root, doc->children, 1); xmlDocDumpMemory(doc, (xmlChar **) & ptr, &len); @@ -358,7 +358,7 @@ XMLTree::find(const string xpath, XMLNode* node) const xmlDocPtr doc = 0; if (node) { - doc = xmlNewDoc((xmlChar*) XML_VERSION); + doc = xmlNewDoc(xml_version); writenode(doc, node, doc->children, 1); ctxt = xmlXPathNewContext(doc); } else { @@ -556,7 +556,7 @@ readnode(xmlNodePtr node) xmlAttrPtr attr; if (node->name) { - name = (char*)node->name; + name = (const char*)node->name; } tmp = new XMLNode(name); @@ -566,7 +566,7 @@ readnode(xmlNodePtr node) if (attr->children) { content = (char*)attr->children->content; } - tmp->add_property((char*)attr->name, content); + tmp->add_property((const char*)attr->name, content); } if (node->content) { @@ -592,9 +592,9 @@ writenode(xmlDocPtr doc, XMLNode* n, xmlNodePtr p, int root = 0) xmlNodePtr node; if (root) { - node = doc->children = xmlNewDocNode(doc, 0, (xmlChar*) n->name().c_str(), 0); + node = doc->children = xmlNewDocNode(doc, 0, (const xmlChar*) n->name().c_str(), 0); } else { - node = xmlNewChild(p, 0, (xmlChar*) n->name().c_str(), 0); + node = xmlNewChild(p, 0, (const xmlChar*) n->name().c_str(), 0); } if (n->is_content()) { @@ -604,7 +604,7 @@ writenode(xmlDocPtr doc, XMLNode* n, xmlNodePtr p, int root = 0) props = n->properties(); for (curprop = props.begin(); curprop != props.end(); ++curprop) { - xmlSetProp(node, (xmlChar*) (*curprop)->name().c_str(), (xmlChar*) (*curprop)->value().c_str()); + xmlSetProp(node, (const xmlChar*) (*curprop)->name().c_str(), (const xmlChar*) (*curprop)->value().c_str()); } children = n->children(); |