From 9034a8e390bfdf2efb5a5483f639dd9aeb7b2703 Mon Sep 17 00:00:00 2001
From: Alexander Voigt <Alexander.Voigt@desy.de>
Date: Fri, 19 Aug 2016 08:51:20 +0200
Subject: [PATCH] no need to catch std::string

---
 templates/librarylink.cpp.in | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/templates/librarylink.cpp.in b/templates/librarylink.cpp.in
index 9214a8d26..7e2f30c34 100644
--- a/templates/librarylink.cpp.in
+++ b/templates/librarylink.cpp.in
@@ -246,16 +246,6 @@ void put_message(MLINK link,
 
 /******************************************************************/
 
-static void put_error_message_and_output(
-   MLINK link, const std::string& function_name,
-   const std::string& message_str)
-{
-   put_message(link, function_name, "error", message_str);
-   put_error_output(link);
-}
-
-/******************************************************************/
-
 void put_settings(const Model_data& data, MLINK link)
 {
    MLPutFunction(link, "List", 17);
@@ -393,9 +383,6 @@ void calculate_spectrum(Model_data& data, MLINK link)
    } catch (const flexiblesusy::Error& e) {
       put_message(link, "FS@ModelName@CalculateSpectrum", "error", e.what());
       throw EInvalidSpectrum();
-   } catch (const std::string& s) {
-      put_message(link, "FS@ModelName@CalculateSpectrum", "error", s);
-      throw EInvalidSpectrum();
    }
 
    @ModelName@_spectrum_generator<algorithm_type> spectrum_generator;
@@ -718,9 +705,8 @@ DLLEXPORT int FS@ModelName@CalculateObservables(
 
       put_observables(observables, link);
    } catch (const flexiblesusy::Error& e) {
-      put_error_message_and_output(link, "FS@ModelName@CalculateObservables", e.what());
-   } catch (const std::string& str) {
-      put_error_message_and_output(link, "FS@ModelName@CalculateObservables", str);
+      put_message(link, "FS@ModelName@CalculateObservables", "error", e.what());
+      put_error_output(link);
    }
 
    return LIBRARY_NO_ERROR;