github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-04-16 01:30:43 +00:00
Code Issues Releases Wiki Activity

add Rtools::Catch2Cerr

Browse Source
This commit is contained in:
wfjm
2018-10-27 12:41:12 +02:00
parent 415b0940ba
commit 4b355707c8
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/src/librtools/Rtools.cpp
View File

@@ -1,6 +1,6 @@
// $Id: Rtools.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rtools.cpp 1059 2018-10-27 10:34:16Z mueller $
//
// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,7 +13,8 @@
//
// Revision History:
// Date Rev Version Comment
// 2017-02-18 852 1.0.7 remove TimeOfDayAsDouble()
// 2018-10-26 1059 1.0.8 add Catch2Cerr()
// 2017-02-18 852 1.0.7 remove TimeOfDayAsDouble()
// 2014-11-23 606 1.0.6 add TimeOfDayAsDouble()
// 2014-11-08 602 1.0.5 add (int) cast in snprintf to match %d type
// 2014-08-22 584 1.0.4 use nullptr
@@ -171,5 +172,26 @@ bool CreateBackupFile(const RparseUrl& purl, RerrMsg& emsg)
return true;
}
//------------------------------------------+-----------------------------------
//! FIXME_docs
void Catch2Cerr(const char* msg, std::function<void()> func)
{
try {
func();
} catch (Rexception& e) {
cerr << "Catch2Cerr-E: exception '" << e.ErrMsg().Text()
<< "' thrown in " << e.ErrMsg().Meth()
<< " caught and dropped in " << msg << endl;
} catch (exception& e) {
cerr << "Catch2Cerr-E: exception '" << e.what()
<< " caught and dropped in " << msg << endl;
} catch(...) {
cerr << "Catch2Cerr-E: non std::exception"
<< " caught and dropped in " << msg << endl;
}
return;
}
} // end namespace Rtools
} // end namespace Retro

8
tools/src/librtools/Rtools.hpp
View File

@@ -1,6 +1,6 @@
// $Id: Rtools.hpp 983 2018-01-02 20:35:59Z mueller $
// $Id: Rtools.hpp 1059 2018-10-27 10:34:16Z mueller $
//
// Copyright 2011-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
// This program is free software; you may redistribute and/or modify it under
// the terms of the GNU General Public License as published by the Free
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-10-26 1059 1.0.7 add Catch2Cerr()
// 2017-02-18 852 1.0.6 remove TimeOfDayAsDouble()
// 2017-02-11 850 1.0.5 add Word2Bytes() and Bytes2Word()
// 2014-11-23 606 1.0.4 add TimeOfDayAsDouble()
@@ -32,6 +33,7 @@
#include <cstdint>
#include <string>
#include <functional>
#include "RerrMsg.hpp"
#include "RparseUrl.hpp"
@@ -59,6 +61,8 @@ namespace Retro {
void Word2Bytes(uint16_t word, uint16_t& byte0, uint16_t& byte1);
uint16_t Bytes2Word(uint16_t byte0, uint16_t byte1);
void Catch2Cerr(const char* msg, std::function<void()> func);
} // end namespace Rtools
} // end namespace Retro