Deal with OIIO deprecations (1844)

lgritz · lgritz · commit f27825ac6fc1 · 2024-07-22T22:17:28.000-04:00
Signed-off-by: Larry Gritz &lt;lg@larrygritz.com&gt;
diff --git a/src/liboslexec/batched_llvm_gen.cpp b/src/liboslexec/batched_llvm_gen.cpp
@@ -2918,7 +2918,8 @@ LLVMGEN(llvm_gen_filterwidth)
             }
 
             rop.ll.call_function(rop.build_name(func_spec),
-                                 { &args[0], argCount });
+                                 { &args[0],
+                                   cspan<llvm::Value*>::size_type(argCount) });
             // Don't have 2nd order derivs
             rop.llvm_zero_derivs(Result);
         }
@@ -6923,7 +6924,9 @@ LLVMGEN(llvm_gen_calculatenormal)
         args[arg_count++] = rop.ll.mask_as_int(rop.ll.current_mask());
         func_spec.mask();
     }
-    rop.ll.call_function(rop.build_name(func_spec), { &args[0], arg_count });
+    rop.ll.call_function(rop.build_name(func_spec),
+                         { &args[0],
+                           cspan<llvm::Value*>::size_type(arg_count) });
 
     if (Result.has_derivs())
         rop.llvm_zero_derivs(Result);

Original file line number	Diff line number	Diff line change
`@@ -2918,7 +2918,8 @@ LLVMGEN(llvm_gen_filterwidth)`
`2918`	`2918`	`}`
`2919`	`2919`
`2920`	`2920`	`rop.ll.call_function(rop.build_name(func_spec),`
`2921`		`- { &args[0], argCount });`
	`2921`	`+ { &args[0],`
	`2922`	`+ cspan<llvm::Value*>::size_type(argCount) });`
`2922`	`2923`	`// Don't have 2nd order derivs`
`2923`	`2924`	`rop.llvm_zero_derivs(Result);`
`2924`	`2925`	`}`
`@@ -6923,7 +6924,9 @@ LLVMGEN(llvm_gen_calculatenormal)`
`6923`	`6924`	`args[arg_count++] = rop.ll.mask_as_int(rop.ll.current_mask());`
`6924`	`6925`	`func_spec.mask();`
`6925`	`6926`	`}`
`6926`		`- rop.ll.call_function(rop.build_name(func_spec), { &args[0], arg_count });`
	`6927`	`+ rop.ll.call_function(rop.build_name(func_spec),`
	`6928`	`+ { &args[0],`
	`6929`	`+ cspan<llvm::Value*>::size_type(arg_count) });`
`6927`	`6930`
`6928`	`6931`	`if (Result.has_derivs())`
`6929`	`6932`	`rop.llvm_zero_derivs(Result);`