Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port Feb 1 2019 through Feb 1 2020 changes #1

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
362ed1b
Merge pull request #143 from ryo-currency/dev
psychocrypt Nov 7, 2018
d4e25f8
Update Ryo copyright notices
fireice-uk Feb 1, 2019
d555d44
Merge pull request #172 from fireice-uk/topic-cc-update
psychocrypt Feb 2, 2019
e7931ca
Remove OptimizeCoinbase refresh
fireice-uk Feb 2, 2019
edd97c2
Merge pull request #173 from fireice-uk/topic-rm-opt-coinbase
psychocrypt Feb 2, 2019
89d462a
Ryo 0.4.0.0 - Lorentz Transform
fireice-uk Feb 3, 2019
0676721
Merge pull request #174 from fireice-uk/topic-new-release-name
psychocrypt Feb 3, 2019
33b2463
README change
Ryo-RU Feb 3, 2019
0c63033
Merge pull request #176 from fireice-uk/Ryo-RU-readme-update
fireice-uk Feb 3, 2019
0c26a9a
Merge branch 'master' into dev
fireice-uk Feb 3, 2019
2933f3e
Merge pull request #177 from ryo-currency/dev
psychocrypt Feb 3, 2019
132487b
Backport typos from Monero
fireice-uk Feb 15, 2019
399b8f5
Merge pull request #179 from fireice-uk/topic-backport-typo-fixes
psychocrypt Feb 15, 2019
1196440
fix CI
psychocrypt Feb 16, 2019
d12582f
Fix tx serialisation
fireice-uk Feb 20, 2019
ad5cae0
Always use uniform pids
fireice-uk Feb 20, 2019
d96bcdf
Merge pull request #181 from psychocrypt/fix-ci
fireice-uk Feb 20, 2019
ebd6b5c
Merge pull request #182 from fireice-uk/topic-multisig-fix
psychocrypt Feb 20, 2019
cf65276
Increase to v0.4.0.1
fireice-uk Feb 21, 2019
f701e06
Merge pull request #183 from fireice-uk/topic-ver-inc
psychocrypt Feb 21, 2019
61e4a75
libunbound: fix MinGW compile
psychocrypt Feb 21, 2019
e145237
Updated Readme
mosu-forge Feb 22, 2019
792c8e2
Merge pull request #186 from mosu-forge/topic-readme
fireice-uk Feb 25, 2019
fb78556
7zip key images
fireice-uk Feb 25, 2019
056d9ce
Merge pull request #184 from psychocrypt/topic-fixMinGWCompileLibunbound
fireice-uk Feb 25, 2019
3bbfdac
Merge pull request #187 from fireice-uk/topic-7z-key-images
psychocrypt Feb 25, 2019
e165654
Merge branch 'master' into dev
psychocrypt Feb 25, 2019
db7e05f
Create verify_premine_burn_instructions.md
Ryo-RU Feb 25, 2019
bc0798c
Merge pull request #189 from fireice-uk/topic-burn-verify-instr
fireice-uk Feb 26, 2019
0e20734
fix avx2 detection
psychocrypt Mar 13, 2019
2e29ca0
Merge pull request #191 from psychocrypt/fix-avx2detection
fireice-uk Mar 14, 2019
c2f9b91
feat(docs): Add verbage to the readme to outline the process for impo…
KyleMcMaster Apr 4, 2019
40c0903
feat(docs): Provide link to Blockchain Utilities docs from main READM…
KyleMcMaster Apr 6, 2019
640ada9
Merge pull request #192 from KyleMcMaster/feat/import-blockchain-docs
fireice-uk May 6, 2019
9021f43
boost 1.7.0 fixes
fireice-uk May 7, 2019
38be2db
fix boost 1.67 linking
psychocrypt May 9, 2019
b45ca61
travis enforce ubuntu trusty
psychocrypt May 9, 2019
5e7b8d3
Merge pull request #195 from fireice-uk/boost-fixes
fireice-uk May 10, 2019
2d2a8eb
Add save wallets tool
fireice-uk May 6, 2019
77ef9cc
Merge pull request #193 from fireice-uk/topic-save-wallets-tool
psychocrypt May 10, 2019
906b08e
libreadline fix on msys2
fireice-uk May 10, 2019
0102ccb
gulps
fireice-uk May 13, 2019
a98aaa0
Merge pull request #194 from fireice-uk/topic-gulps-rebased
psychocrypt May 14, 2019
5ae3f93
Merge pull request #196 from fireice-uk/topic-readline-fix
psychocrypt May 14, 2019
de4d7ab
re-add `set_log` command
psychocrypt Jun 26, 2019
8891c60
Merge pull request #197 from psychocrypt/topic-setLogLvl
fireice-uk Jun 28, 2019
d8e8ec5
fix missing log categories in message
psychocrypt Jun 28, 2019
222a8d0
Merge pull request #198 from psychocrypt/fix-logMessage
fireice-uk Jun 29, 2019
050bb1e
new plateau emission curve
psychocrypt Jun 29, 2019
f4e12d9
add script to generate plateau emission curve
mosu-forge Jun 30, 2019
a957f5a
Merge pull request #199 from psychocrypt/topic-newEmissionCurve
fireice-uk Jul 2, 2019
3285224
fix mem leakage
Jul 5, 2019
2628387
avoid exposing contructor with bool
psychocrypt Jul 5, 2019
90fea7d
use emplace_back instead of push_back
psychocrypt Jul 6, 2019
f2ca047
Merge pull request #201 from psychocrypt/fix-mem-leakage
fireice-uk Jul 7, 2019
f4ebd13
64bit elliptic curve
Jul 12, 2019
7e84d48
add tests for 64bit elliptic curve implementation
psychocrypt Jul 13, 2019
f2231da
update travis
psychocrypt Jul 13, 2019
6e448dd
Add extra check for hits
fireice-uk Jul 16, 2019
d623123
Merge pull request #202 from psychocrypt/topic-ec64
fireice-uk Jul 16, 2019
f445700
64 bit key derivation
Jul 18, 2019
4b41879
unit test `generate_key_derivation`
psychocrypt Jul 19, 2019
7641f2b
Merge pull request #203 from psychocrypt/topic-key_dev_64
fireice-uk Jul 20, 2019
4a11b9e
fix gulps usage
psychocrypt Jul 23, 2019
7862699
rename gulps macros
psychocrypt Jul 23, 2019
33b15f6
fix style
psychocrypt Jul 23, 2019
1761bad
rename categories
psychocrypt Jul 23, 2019
a4b03c5
Merge pull request #205 from psychocrypt/fix-gulpsUsage
fireice-uk Jul 25, 2019
fb73230
readme update
Ryo-RU Jul 25, 2019
e29e62a
Merge pull request #204 from Ryo-RU/dev
fireice-uk Jul 26, 2019
9e4b663
syntax fix
Ryo-RU Jul 27, 2019
9537800
Multi-threaded wallet scan
fireice-uk Jul 25, 2019
34bba83
Make get_blocks faster
fireice-uk Jul 27, 2019
5aca945
New GULPS adjustments
fireice-uk Jul 27, 2019
5ec4bfe
PSC's ideas
fireice-uk Jul 27, 2019
e7cacc4
Add transactions in block order
fireice-uk Jul 27, 2019
943de9e
Merge pull request #207 from Ryo-RU/dev
fireice-uk Jul 27, 2019
431fffd
Fix for self-referential work packages
fireice-uk Jul 30, 2019
a80e565
Fix for gen-multisig display
fireice-uk Jul 31, 2019
0d0b622
Merge pull request #206 from fireice-uk/topic-parallet-wallet
psychocrypt Jul 31, 2019
abeefcc
Merge pull request #208 from fireice-uk/topic-fix-gen-multisig
psychocrypt Jul 31, 2019
dd7fb26
fix boost version check in CMake
psychocrypt Aug 2, 2019
b705914
fix cmake
psychocrypt Aug 2, 2019
7680755
Merge pull request #209 from psychocrypt/fix-cmakeVersionCompare
fireice-uk Aug 4, 2019
09679b0
Merge pull request #210 from psychocrypt/fix-cmakeSystemProcessorDete…
fireice-uk Aug 4, 2019
545c429
Fixed issue #212
Kryptoxic Aug 6, 2019
e538e03
Fix macos build
fireice-uk Aug 11, 2019
ddf122d
Merge pull request #214 from Kryptoxic/dev
fireice-uk Aug 15, 2019
e25dfe4
Merge pull request #215 from fireice-uk/topic-macos-fix
psychocrypt Aug 19, 2019
ae70088
fix usage of depricated boost functions/defines
psychocrypt Aug 2, 2019
6a10723
Merge pull request #211 from psychocrypt/fix-boostDepricatedUsage
fireice-uk Aug 20, 2019
c6a45c2
optimze queue lock handling
psychocrypt Aug 22, 2019
4eb4c98
fix alt chain coin overflow
psychocrypt Aug 23, 2019
d4178d7
Merge pull request #216 from psychocrypt/topic-deferlock
fireice-uk Aug 23, 2019
cdb1963
Merge pull request #217 from psychocrypt/fix-altChainCoinOverflow
fireice-uk Aug 30, 2019
cd2d039
simplewallet: fix output
psychocrypt Jan 24, 2020
9376655
Merge commit 'cd2d0394d671515ba1e74c7fbcda272b8e8b91ec' into topic-2020
mosu-forge Feb 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
gulps
Co-authored-by: fireice-uk <fireice-uk@users.noreply.github.com>
Co-authored-by: psychocrypt <psychocryptHPC@gmail.com>
Co-authored-by: benqgg <bbarret93@gmail.com>
Co-authored-by: CryptoSeyed <Cryptoseyed@gmail.com>
  • Loading branch information
4 people committed May 13, 2019
commit 0102ccbfa2262075a7897a5df924f0ad688aa4bf
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -113,3 +113,6 @@ local.properties

# VS Code
.vscode

# Document
doc
18 changes: 6 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -259,7 +259,7 @@ endif()
# elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
# set(BSDI TRUE)

include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external)
include_directories(external/rapidjson/include src contrib/epee/include external)

if(APPLE)
include_directories(SYSTEM /usr/include/malloc)
@@ -380,10 +380,6 @@ add_definitions("-DBLOCKCHAIN_DB=${BLOCKCHAIN_DB}")
if (APPLE)
set(DEFAULT_STACK_TRACE OFF)
set(LIBUNWIND_LIBRARIES "")
elseif(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT MINGW)
set(DEFAULT_STACK_TRACE ON)
set(STACK_TRACE_LIB "easylogging++") # for diag output only
set(LIBUNWIND_LIBRARIES "")
elseif (ARM AND STATIC)
set(DEFAULT_STACK_TRACE OFF)
set(LIBUNWIND_LIBRARIES "")
@@ -441,8 +437,6 @@ add_definition_if_library_exists(c memset_s "string.h" HAVE_MEMSET_S)
add_definition_if_library_exists(c explicit_bzero "strings.h" HAVE_EXPLICIT_BZERO)
add_definition_if_function_found(strptime HAVE_STRPTIME)

add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)

# Generate header for embedded translations
include(ExternalProject)
ExternalProject_Add(generate_translations_header
@@ -457,10 +451,6 @@ add_subdirectory(external)
include_directories(${UNBOUND_INCLUDE})
link_directories(${UNBOUND_LIBRARY_DIRS})

# Final setup for easylogging++
include_directories(${EASYLOGGING_INCLUDE})
link_directories(${EASYLOGGING_LIBRARY_DIRS})

# Final setup for liblmdb
include_directories(${LMDB_INCLUDE})

@@ -797,6 +787,11 @@ if (${BOOST_IGNORE_SYSTEM_PATHS} STREQUAL "ON")
endif()

set(OLD_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})

if(MINGW)
set(Boost_NO_BOOST_CMAKE ON)
endif()

if(STATIC)
if(MINGW)
set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
@@ -821,7 +816,6 @@ endif()

include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
if(MINGW)
set(Boost_NO_BOOST_CMAKE ON)
set(EXTRA_LIBRARIES mswsock;ws2_32;iphlpapi)
set(ICU_LIBRARIES ${Boost_LOCALE_LIBRARY} icuio icuin icuuc icudt icutu iconv)
elseif(APPLE OR OPENBSD OR ANDROID)
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places.
# The default value is: My Project.

PROJECT_NAME = "Monero"
PROJECT_NAME = "Ryo"

# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version
3 changes: 2 additions & 1 deletion contrib/epee/demo/demo_http_server/stdafx.h
Original file line number Diff line number Diff line change
@@ -32,4 +32,5 @@

#define BOOST_FILESYSTEM_VERSION 3
#define ENABLE_RELEASE_LOGGING
#include "misc_log_ex.h"
#include "common/gulps.hpp"

3 changes: 2 additions & 1 deletion contrib/epee/demo/demo_levin_server/stdafx.h
Original file line number Diff line number Diff line change
@@ -33,4 +33,5 @@
#define BOOST_FILESYSTEM_VERSION 3
#define ENABLE_RELEASE_LOGGING
#include "log_opt_defs.h"
#include "misc_log_ex.h"
#include "common/gulps.hpp"

25 changes: 14 additions & 11 deletions contrib/epee/include/ado_db_helper.h
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
#define GULPS_CAT_MAJOR "ado_db_help"

#ifndef _DB_ADO_HELPER_H_
#define _DB_ADO_HELPER_H_
@@ -34,6 +35,8 @@
#include <comutil.h>
#include <vector>

#include "common/gulps.hpp"

#define BEGIN_TRY_SECTION() \
try \
{
@@ -44,7 +47,7 @@
} \
catch(const std::exception &ex) \
{ \
LOG_PRINT_J("DB_ERROR: " << ex.what(), LOG_LEVEL_0); \
GULPS_ERRORF("DB_ERROR: {}", ex.what(); \
return ret_val; \
} \
catch(const _com_error &comm_err) \
@@ -54,12 +57,12 @@
const TCHAR *pmessage = comm_err.ErrorMessage(); \
pstr = comm_err.Source(); \
std::string source = string_encoding::convert_to_ansii(pstr ? pstr : TEXT("")); \
LOG_PRINT_J("COM_ERROR " << mess_where << ":\n\tDescriprion:" << descr << ", \n\t Message: " << string_encoding::convert_to_ansii(pmessage) << "\n\t Source: " << source, LOG_LEVEL_0); \
GULPS_ERRORF("COM_ERROR {}:\n\tDescriprion:{}, \n\t Message: {}\n\t Source: {}", mess_where, descr, string_encoding::convert_to_ansii(pmessage), source); \
return ret_val; \
} \
catch(...) \
{ \
LOG_PRINT_J("..._ERROR: Unknown error.", LOG_LEVEL_0); \
GULPS_ERROR("..._ERROR: Unknown error."); \
return ret_val; \
}

@@ -352,7 +355,7 @@ inline bool select_helper(ADODB::_CommandPtr cmd, table &result_vector)
ADODB::_RecordsetPtr precordset = cmd->Execute(NULL, NULL, NULL);
if(!precordset)
{
LOG_ERROR("DB_ERROR: cmd->Execute returned NULL!!!");
GULPS_ERROR("DB_ERROR: cmd->Execute returned NULL!!!");
return false;
}

@@ -364,7 +367,7 @@ inline bool select_helper(ADODB::_CommandPtr cmd, table &result_vector)
{
if(precordset->MoveFirst()!= S_OK)
{
LOG_ERROR("DB_ERROR: Filed to move first!!!");
GULPS_ERROR("DB_ERROR: Filed to move first!!!");
return false;
}
}
@@ -956,18 +959,18 @@ class per_thread_connection_pool

if(S_OK != conn.CreateInstance(__uuidof(ADODB::Connection)))
{
LOG_ERROR("Failed to Create, instance, was CoInitialize called ???!");
GULPS_ERROR("Failed to Create, instance, was CoInitialize called ???!");
return conn;
}

HRESULT res = conn->Open(_bstr_t(m_connection_string.c_str()), _bstr_t(m_login.c_str()), _bstr_t(m_password.c_str()), NULL);
if(res != S_OK)
{
LOG_ERROR("Failed to connect do DB, connection str:" << m_connection_string);
GULPS_ERRORF("Failed to connect do DB, connection str:{}", m_connection_string);
return conn;
}
CATCH_TRY_SECTION_MESS(conn, "while creating another connection");
LOG_PRINT("New DB Connection added for threadid=" << ::GetCurrentThreadId(), LOG_LEVEL_0);
GULPS_PRINTF("New DB Connection added for threadid={}", ::GetCurrentThreadId());
ado_db_helper::execute_helper(conn, "set enable_seqscan=false;");
return conn;
}
@@ -994,7 +997,7 @@ class per_thread_connection_pool
HRESULT res = rconn->Open(_bstr_t(m_connection_string.c_str()), _bstr_t(m_login.c_str()), _bstr_t(m_password.c_str()), NULL);
if(res != S_OK)
{
LOG_PRINT("Failed to restore connection to local AI DB", LOG_LEVEL_1);
GULPS_LOG_L1("Failed to restore connection to local AI DB");
return false;
}
CATCH_TRY_SECTION(false);
@@ -1067,8 +1070,8 @@ bool find_or_add_t_multiparametred(const std::string &sql_select_statment, const
{
//last time try to select
res = select_helper_multiparam(c.get_db_connection(), sql_select_statment, params, result_table);
CHECK_AND_ASSERT_MES(res, false, "Failed to execute statment: " << sql_select_statment);
CHECK_AND_ASSERT_MES(result_table.size(), false, "No records returned from statment: " << sql_select_statment);
GULPS_CHECK_AND_ASSERT_MES(res, false, "Failed to execute statment: " , sql_select_statment);
GULPS_CHECK_AND_ASSERT_MES(result_table.size(), false, "No records returned from statment: " , sql_select_statment);
}
else
{
32 changes: 17 additions & 15 deletions contrib/epee/include/console_handler.h
Original file line number Diff line number Diff line change
@@ -23,10 +23,13 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
#ifdef GULPS_CAT_MAJOR
#undef GULPS_CAT_MAJOR
#endif
#define GULPS_CAT_MAJOR "csl_hand"

#pragma once

#include "misc_log_ex.h"
#include "string_tools.h"
#include <atomic>
#include <condition_variable>
@@ -41,6 +44,8 @@
#include <boost/algorithm/string/split.hpp>
#include <boost/thread.hpp>

#include "common/gulps.hpp"

#ifdef HAVE_READLINE
#include "readline_buffer.h"
#endif
@@ -322,14 +327,12 @@ class async_console_handler
color_prompt += " ";
color_prompt += "\001\033[0m\002";
m_stdin_reader.get_readline_buffer().set_prompt(color_prompt);
#else
epee::set_console_color(epee::console_color_yellow, true);
std::cout << prompt;
if(' ' != prompt.back())
std::cout << ' ';
epee::reset_console_color();
std::cout.flush();
#endif

if(prompt.back() != ' ')
prompt += ' ';
gulps::inst().log(gulps::message(gulps::OUT_USER_0, gulps::LEVEL_PRINT, GULPS_CAT_MAJOR,
"cmd_prompt", __FILE__, __LINE__, std::move(prompt), gulps::COLOR_BOLD_YELLOW, false));
}
}

@@ -357,11 +360,10 @@ class async_console_handler
}
if(!get_line_ret)
{
MERROR("Failed to read line.");
GULPS_ERROR("Failed to read line.");
}
string_tools::trim(command);

LOG_PRINT_L2("Read command: " << command);
GULPS_LOG_L2("Read command: ", command);
if(command.empty())
{
continue;
@@ -379,13 +381,13 @@ class async_console_handler
#ifdef HAVE_READLINE
rdln::suspend_readline pause_readline;
#endif
std::cout << "unknown command: " << command << std::endl;
std::cout << usage;
GULPS_PRINT("unknown command: ", command);
GULPS_PRINT(usage);
}
}
catch(const std::exception &ex)
{
LOG_ERROR("Exception at [console_handler], what=" << ex.what());
GULPS_ERRORF("Exception at [console_handler], what={}", ex.what());
}
}
if(exit_handler)
@@ -484,7 +486,7 @@ class command_handler

for(auto &x : m_command_handlers)
{
ss << x.second.second.first << ENDL;
ss << x.second.second.first << "\n";
}
return ss.str();
}
6 changes: 3 additions & 3 deletions contrib/epee/include/gzip_encoding.h
Original file line number Diff line number Diff line change
@@ -106,7 +106,7 @@ class content_encoding_gzip : public i_sub_handler

int flag = Z_SYNC_FLUSH;
int ret = inflate(&m_zstream_in, flag);
CHECK_AND_ASSERT_MES(ret >= 0 || m_zstream_in.avail_out || m_is_deflate_mode, false, "content_encoding_gzip::update_in() Failed to inflate. err = " << ret);
GULPS_CHECK_AND_ASSERT_MES(ret >= 0 || m_zstream_in.avail_out || m_is_deflate_mode, false, "content_encoding_gzip::update_in() Failed to inflate. err = " , ret);

if(Z_STREAM_END == ret)
m_is_stream_ended = true;
@@ -126,7 +126,7 @@ class content_encoding_gzip : public i_sub_handler
ret = inflate(&m_zstream_in, Z_NO_FLUSH);
if(ret != Z_OK)
{
LOCAL_ASSERT(0);
GULPS_LOCAL_ASSERT(0);
m_pre_decode.swap(piece_of_transfer);
return false;
}
@@ -136,7 +136,7 @@ class content_encoding_gzip : public i_sub_handler
ret = inflate(&m_zstream_in, Z_NO_FLUSH);
if(ret != Z_OK)
{
LOCAL_ASSERT(0);
GULPS_LOCAL_ASSERT(0);
m_pre_decode.swap(piece_of_transfer);
return false;
}
2 changes: 1 addition & 1 deletion contrib/epee/include/include_base_utils.h
Original file line number Diff line number Diff line change
@@ -29,4 +29,4 @@
#define BOOST_FILESYSTEM_VERSION 3
#define ENABLE_RELEASE_LOGGING

#include "misc_log_ex.h"
#include "common/gulps.hpp"
11 changes: 9 additions & 2 deletions contrib/epee/include/misc_language.h
Original file line number Diff line number Diff line change
@@ -23,12 +23,19 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
#ifdef GULPS_CAT_MAJOR
#undef GULPS_CAT_MAJOR
#endif
#define GULPS_CAT_MAJOR "msc_lang"

#pragma once

#include <boost/thread.hpp>
#include <boost/utility/value_init.hpp>
#include <limits>

#include "common/gulps.hpp"

namespace epee
{
#define STD_TRY_BEGIN() \
@@ -39,12 +46,12 @@ namespace epee
} \
catch(const std::exception &e) \
{ \
LOG_ERROR("EXCEPTION: " << where_ << ", mes: " << e.what()); \
GULPS_ERRORF("EXCEPTION: {}, mes: {}", where_, e.what()); \
return ret_val; \
} \
catch(...) \
{ \
LOG_ERROR("EXCEPTION: " << where_); \
GULPS_ERRORF("EXCEPTION: {}", where_); \
return ret_val; \
}

Loading