Make it build on llvm 3.5

Tried to take care to keep it compatible with <3.4.
Similar here. I don't believe the explicit namespace is necessary, if you are using the latest OIIO.