From 0c48c6e6c4cd953523a10bcb804fde67e4650a57 Mon Sep 17 00:00:00 2001 From: Cedric Nugteren Date: Sat, 6 Jan 2018 19:32:54 +0100 Subject: Fixed a minor nullptr related issue in the code generator --- scripts/generator/generator/cpp.py | 5 +++-- scripts/generator/generator/routine.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/generator/generator/cpp.py b/scripts/generator/generator/cpp.py index 656253d7..3631e737 100644 --- a/scripts/generator/generator/cpp.py +++ b/scripts/generator/generator/cpp.py @@ -61,8 +61,9 @@ def clblast_cc(routine, cuda=False): if routine.batched: result += " " + (NL + " ").join(routine.batched_transform_to_cpp()) + NL if routine.temp_buffer: - result += " const auto temp_buffer_provided = temp_buffer != nullptr;\n" - result += " auto temp_buffer_cpp = temp_buffer_provided ? Buffer(temp_buffer) : Buffer(nullptr);\n" + null = "0" if cuda else "nullptr" + result += " const auto temp_buffer_provided = temp_buffer != " + null + ";\n" + result += " auto temp_buffer_cpp = temp_buffer_provided ? Buffer(temp_buffer) : Buffer(" + null + ");\n" result += " routine.Do" + routine.capitalized_name() + "(" result += ("," + NL + indent1).join([a for a in routine.arguments_clcudaapi()]) if routine.temp_buffer: diff --git a/scripts/generator/generator/routine.py b/scripts/generator/generator/routine.py index 22be02b0..dd3c2ecb 100644 --- a/scripts/generator/generator/routine.py +++ b/scripts/generator/generator/routine.py @@ -822,7 +822,7 @@ class Routine: if self.temp_buffer: result += ",\n" + indent + mem_type + " temp_buffer" if not implementation: - result += " = nullptr" + result += " = 0" if cuda else " = nullptr" result += ")" return result -- cgit v1.2.3