From c73feec5a16ae88cce8258a02c318b82a52aa85c Mon Sep 17 00:00:00 2001
From: Sam Yates <halfflat@gmail.com>
Date: Thu, 27 Jun 2019 13:33:36 +0200
Subject: [PATCH] Add missing namespace qualification in simd printing. (#802)
* Add `::arb::` decoration to `fvm_value_type` and `fvm_index_type` in modcc simd cprinter output.
* Return stream from unwind stack trace printer.
Fixes #801 and also a long standing (but low impact) bug in unwind code.
---
arbor/util/unwind.cpp | 1 +
modcc/printer/cprinter.cpp | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arbor/util/unwind.cpp b/arbor/util/unwind.cpp
index 5303c902..4e0e1cb9 100644
--- a/arbor/util/unwind.cpp
+++ b/arbor/util/unwind.cpp
@@ -73,6 +73,7 @@ std::ostream& operator<<(std::ostream& out, const backtrace& trace) {
break;
}
}
+ return out;
}
#if 0
diff --git a/modcc/printer/cprinter.cpp b/modcc/printer/cprinter.cpp
index accb25a3..16f96ea7 100644
--- a/modcc/printer/cprinter.cpp
+++ b/modcc/printer/cprinter.cpp
@@ -171,7 +171,7 @@ std::string emit_cpp_source(const Module& module_, const printer_options& opt) {
"static constexpr unsigned simd_width_ = ";
if (!opt.simd.width) {
- out << "S::simd_abi::native_width<fvm_value_type>::value;\n";
+ out << "S::simd_abi::native_width<::arb::fvm_value_type>::value;\n";
}
else {
out << opt.simd.width << ";\n";
@@ -188,8 +188,8 @@ std::string emit_cpp_source(const Module& module_, const printer_options& opt) {
}
out <<
- "using simd_value = S::simd<fvm_value_type, simd_width_, " << abi << ">;\n"
- "using simd_index = S::simd<fvm_index_type, simd_width_, " << abi << ">;\n"
+ "using simd_value = S::simd<::arb::fvm_value_type, simd_width_, " << abi << ">;\n"
+ "using simd_index = S::simd<::arb::fvm_index_type, simd_width_, " << abi << ">;\n"
"\n";
}
--
GitLab