|
Some of you have seen on oiio-dev that Jeremy Selan has proposed a patch to fix up some longstanding OIIO namespace issues, namely to put some stray namespace-less helper classes (TypeDesc, ParamList, ustring, etc.) in the OpenImageIO namespace once and for all, as well as to clean up and centralize some of the versioning and custom namespace selection.
The attached patch alters OSL so that it builds properly with both the old OIIO as well as the proposed new one. To make it work for both old and new, it's a little uglier than I'd like. But fundamentally, it's just rearranging some #include file ordering, and conditionally adding the occasional 'using' and 'namespace=' directives that are needed once those helper classes (which we use extensively in OSL) get in their proper namespaces.
Some of the ugliness can be removed down the road, once we're in a state where all OSL users are are on OIIO 0.9 or above.
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+158 lines, -55 lines) |
Patch |
|
|
site/spi/Makefile-bits
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
|
src/cmake/oiio.cmake
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
|
|
src/include/oslconfig.h
|
View
|
|
2 chunks |
+16 lines, -3 lines |
0 comments
|
Download
|
|
|
src/include/oslquery.h
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
|
|
src/liboslcomp/ast.h
|
View
|
|
1 chunk |
+6 lines, -2 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/ast.cpp
|
View
|
|
1 chunk |
+5 lines, -3 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/codegen.cpp
|
View
|
|
1 chunk |
+6 lines, -3 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/oslcomp.cpp
|
View
|
|
1 chunk |
+7 lines, -4 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/oslcomp_pvt.h
|
View
|
|
1 chunk |
+1 line, -2 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/oslgram.y
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/osllex.l
|
View
|
|
1 chunk |
+1 line, -0 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/symtab.cpp
|
View
|
|
1 chunk |
+6 lines, -3 lines |
0 comments
|
Download
|
|
|
src/liboslcomp/typecheck.cpp
|
View
|
|
1 chunk |
+6 lines, -3 lines |
0 comments
|
Download
|
|
|
src/liboslexec/automata.h
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
|
|
src/liboslexec/automata.cpp
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/constantpool.h
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/instance.cpp
|
View
|
|
1 chunk |
+6 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/llvm_instance.cpp
|
View
|
|
2 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
|
|
src/liboslexec/llvm_ops.cpp
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/loadshader.cpp
|
View
|
|
2 chunks |
+7 lines, -3 lines |
0 comments
|
Download
|
|
|
src/liboslexec/master.cpp
|
View
|
|
1 chunk |
+5 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/opmessage.cpp
|
View
|
|
1 chunk |
+4 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/oslexec_pvt.h
|
View
|
|
1 chunk |
+10 lines, -0 lines |
0 comments
|
Download
|
|
|
src/liboslexec/osoreader.h
|
View
|
|
1 chunk |
+5 lines, -3 lines |
0 comments
|
Download
|
|
|
src/liboslexec/osoreader.cpp
|
View
|
|
1 chunk |
+7 lines, -5 lines |
0 comments
|
Download
|
|
|
src/liboslexec/rendservices.cpp
|
View
|
|
1 chunk |
+7 lines, -5 lines |
0 comments
|
Download
|
|
|
src/liboslexec/runtimeoptimize.cpp
|
View
|
|
2 chunks |
+4 lines, -2 lines |
0 comments
|
Download
|
|
|
src/liboslexec/shadingsys.cpp
|
View
|
|
1 chunk |
+7 lines, -4 lines |
0 comments
|
Download
|
|
|
src/liboslquery/oslquery.cpp
|
View
|
|
1 chunk |
+5 lines, -2 lines |
0 comments
|
Download
|
|
|
src/testshade/testshade.cpp
|
View
|
|
3 chunks |
+8 lines, -4 lines |
0 comments
|
Download
|
Total messages: 1
|