diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-10 12:04:33 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-10 12:04:33 +0300 |
| commit | db7a78a2be7849f47c81c907ad0710ece66018b7 (patch) | |
| tree | 6096ad3ff23b4739ecd83e3bacd6d4b633561b10 /intern/cycles/graph/node_xml.h | |
| parent | a466d7ae248b2807b4e2f8693b458d3da509e9bc (diff) | |
Cycles: Fix compilation error with latest OIIO
There was some changes about namespaces, which causes ambiguities.
Replaces using namespace with an explicit symbols we need. Is good idea to NOT
pull in the whole namespace anyway!
Diffstat (limited to 'intern/cycles/graph/node_xml.h')
| -rw-r--r-- | intern/cycles/graph/node_xml.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/graph/node_xml.h b/intern/cycles/graph/node_xml.h index 63e80bf79f2..b648c9666c1 100644 --- a/intern/cycles/graph/node_xml.h +++ b/intern/cycles/graph/node_xml.h @@ -28,8 +28,8 @@ struct XMLReader { map<ustring, Node*> node_map; }; -void xml_read_node(XMLReader& reader, Node *node, pugi::xml_node xml_node); -pugi::xml_node xml_write_node(Node *node, pugi::xml_node xml_root); +void xml_read_node(XMLReader& reader, Node *node, xml_node xml_node); +xml_node xml_write_node(Node *node, xml_node xml_root); CCL_NAMESPACE_END |