From 520b07a131ce41962ba965a3d90085231fb626f6 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 18 Jul 2019 12:29:30 -0500 Subject: [PATCH] Using C-types only in capi function definitions. --- src/cell.cpp | 4 ++-- src/material.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cell.cpp b/src/cell.cpp index 9d5b2af9d0..7753e83332 100644 --- a/src/cell.cpp +++ b/src/cell.cpp @@ -1085,14 +1085,14 @@ openmc_cell_get_temperature(int32_t index, const int32_t* instance, double* T) //! Get the name of a cell extern "C" int -openmc_cell_get_name(int32_t index, char*& name) { +openmc_cell_get_name(int32_t index, char** name) { if (index < 0 || index >= model::cells.size()) { strcpy(openmc_err_msg, "Index in cells array is out of bounds."); return OPENMC_E_OUT_OF_BOUNDS; } auto name_str = model::cells[index]->name_; - strcpy(name, name_str.c_str()); + strcpy(*name, name_str.c_str()); return 0; } diff --git a/src/material.cpp b/src/material.cpp index f14bfc8f29..356c2bf212 100644 --- a/src/material.cpp +++ b/src/material.cpp @@ -1382,14 +1382,14 @@ openmc_material_set_id(int32_t index, int32_t id) } extern "C" int -openmc_material_get_name(int32_t index, char*& name) { +openmc_material_get_name(int32_t index, char** name) { if (index < 0 || index >= model::materials.size()) { strcpy(openmc_err_msg, "Index in materials array is out of bounds."); return OPENMC_E_OUT_OF_BOUNDS; } auto name_str = model::materials[index]->name(); - strcpy(name, name_str.c_str()); + strcpy(*name, name_str.c_str()); return 0; }