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/util | |
| 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/util')
| -rw-r--r-- | intern/cycles/util/util_xml.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/util/util_xml.h b/intern/cycles/util/util_xml.h index cfd0afc95f7..e1a28df9433 100644 --- a/intern/cycles/util/util_xml.h +++ b/intern/cycles/util/util_xml.h @@ -23,7 +23,8 @@ CCL_NAMESPACE_BEGIN -OIIO_NAMESPACE_USING +using OIIO_NAMESPACE::pugi::xml_node; +using OIIO_NAMESPACE::pugi::xml_attribute; CCL_NAMESPACE_END |