From f27018912c78e0db12279bfaa7debda3ada1e709 Mon Sep 17 00:00:00 2001 From: Nathan-MV <67521199+Nathan-MV@users.noreply.github.com> Date: Sun, 29 Sep 2024 11:34:55 +0000 Subject: [PATCH] fix conflicts with #207 --- binding/binding-mri.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/binding/binding-mri.cpp b/binding/binding-mri.cpp index 49bf0fb7..603b8801 100644 --- a/binding/binding-mri.cpp +++ b/binding/binding-mri.cpp @@ -693,7 +693,7 @@ RB_METHOD_GUARD(mkxpLaunch) { } RB_METHOD_GUARD_END -RB_METHOD(mkxpParseCSV) { +RB_METHOD_GUARD(mkxpParseCSV) { RB_UNUSED_PARAM; VALUE str; @@ -713,11 +713,12 @@ RB_METHOD(mkxpParseCSV) { rb_ary_push(ret, col); } } catch (std::exception &e) { - raiseRbExc(Exception(Exception::MKXPError, "Failed to parse CSV: %s", e.what())); + throw Exception(Exception::MKXPError, "Failed to parse CSV: %s", e.what()); } - + return ret; } +RB_METHOD_GUARD_END json5pp::value loadUserSettings() { json5pp::value ret;