diff options
| -rw-r--r-- | src/com/mbien/opencl/CLBuildConfiguration.java | 6 | ||||
| -rw-r--r-- | src/com/mbien/opencl/CLProgramBuilder.java | 2 | ||||
| -rw-r--r-- | src/com/mbien/opencl/CLProgramConfiguration.java | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/com/mbien/opencl/CLBuildConfiguration.java b/src/com/mbien/opencl/CLBuildConfiguration.java index eee641a0..875f8d3a 100644 --- a/src/com/mbien/opencl/CLBuildConfiguration.java +++ b/src/com/mbien/opencl/CLBuildConfiguration.java @@ -61,7 +61,7 @@ public interface CLBuildConfiguration extends Cloneable { /** * Adds the definition to the build configuration. - * @see CLProgram#define(java.lang.String, java.lang.String) + * @see CLProgram#define(java.lang.String, java.lang.Object) */ public CLBuildConfiguration withDefine(String name, Object value); @@ -73,9 +73,9 @@ public interface CLBuildConfiguration extends Cloneable { /** * Adds the definitions to the build configuration. - * @see CLProgram#define(java.lang.String, java.lang.String) + * @see CLProgram#define(java.lang.String, java.lang.Object) */ - public CLBuildConfiguration withDefines(Map<String, String> defines); + public CLBuildConfiguration withDefines(Map<String, ? extends Object> defines); /** * Adds the compiler option to the build configuration. diff --git a/src/com/mbien/opencl/CLProgramBuilder.java b/src/com/mbien/opencl/CLProgramBuilder.java index fef7d878..14300ef0 100644 --- a/src/com/mbien/opencl/CLProgramBuilder.java +++ b/src/com/mbien/opencl/CLProgramBuilder.java @@ -153,7 +153,7 @@ public final class CLProgramBuilder implements CLProgramConfiguration, Serializa } @Override - public CLProgramBuilder withDefines(Map<String, String> defines) { + public CLProgramBuilder withDefines(Map<String, ? extends Object> defines) { for (String name : defines.keySet()) { defineSet.add(CLProgram.define(name, defines.get(name))); } diff --git a/src/com/mbien/opencl/CLProgramConfiguration.java b/src/com/mbien/opencl/CLProgramConfiguration.java index fc074f33..405b911d 100644 --- a/src/com/mbien/opencl/CLProgramConfiguration.java +++ b/src/com/mbien/opencl/CLProgramConfiguration.java @@ -36,7 +36,7 @@ public interface CLProgramConfiguration extends CLBuildConfiguration { @Override public CLProgramConfiguration withDefine(String name); @Override public CLProgramConfiguration withDefine(String name, Object value); @Override public CLProgramConfiguration withDefines(String... names); - @Override public CLProgramConfiguration withDefines(Map<String, String> defines); + @Override public CLProgramConfiguration withDefines(Map<String, ? extends Object> defines); @Override public CLProgramConfiguration withOption(String option); @Override public CLProgramConfiguration withOptions(String... options); @Override public CLProgramConfiguration reset(); |