diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-13 12:40:19 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-13 12:42:29 +0300 |
| commit | 42dff6cc2ebe21bee401bc115139c4f62aabc6f5 (patch) | |
| tree | 732409aa5bc973ea74c9a13bf3d7794b09540c0c /intern/cycles/util | |
| parent | e568c1a9757a5d4f8a52822cbbe772d0ac4da78b (diff) | |
Cycles: Fix compilation error with OIIO compiled against system PugiXML
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_xml.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/intern/cycles/util/util_xml.h b/intern/cycles/util/util_xml.h index e1a28df9433..c9c1ea47e96 100644 --- a/intern/cycles/util/util_xml.h +++ b/intern/cycles/util/util_xml.h @@ -23,10 +23,17 @@ CCL_NAMESPACE_BEGIN -using OIIO_NAMESPACE::pugi::xml_node; -using OIIO_NAMESPACE::pugi::xml_attribute; +OIIO_NAMESPACE_USING + +#ifdef WITH_SYSTEM_PUGIXML +# define PUGIXML_NAMESPACE pugi +#else +# define PUGIXML_NAMESPACE OIIO_NAMESPACE::pugi +#endif + +using PUGIXML_NAMESPACE::xml_node; +using PUGIXML_NAMESPACE::xml_attribute; CCL_NAMESPACE_END #endif /* __UTIL_XML_H__ */ - |