Merge master (1.0.1) into develop (1.1.0-b3)

This commit is contained in:
Nik Bougalis
2018-06-25 13:52:57 -07:00
4 changed files with 100 additions and 49 deletions

View File

@@ -20,8 +20,10 @@
#ifndef RIPPLE_JSON_JSON_ASSERT_H_INCLUDED
#define RIPPLE_JSON_JSON_ASSERT_H_INCLUDED
#include "ripple/json/json_errors.h"
#define JSON_ASSERT_UNREACHABLE assert( false )
#define JSON_ASSERT( condition ) assert( condition ); // @todo <= change this into an exception throw
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) ripple::Throw<std::runtime_error> ( message );
#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) ripple::Throw<Json::error> ( message );
#endif