Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Win32 compile fixes

Browse source
This commit is contained in:
Eric Frias 2015-07-09 09:51:15 -04:00
parent 629d884b84
commit 5dea2825b5
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/app/CMakeLists.txt
View file

@ -11,5 +11,5 @@ target_include_directories( graphene_app
PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
if(MSVC)
set_source_files_properties( application.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
set_source_files_properties( application.cpp api.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
endif(MSVC)

2
libraries/chain/db_init.cpp
View file

@ -479,6 +479,6 @@ void database::init_genesis(const genesis_state_type& genesis_state)
});
_undo_db.enable();
} FC_CAPTURE_AND_RETHROW(()) }
} FC_CAPTURE_AND_RETHROW() }
} }

6
libraries/chain/evaluator.cpp
View file

@ -92,24 +92,30 @@ database& generic_evaluator::db()const { return trx_state->db(); }
operation_get_required_authorities( op, other_auths );
for( auto id : active_auths )
{
GRAPHENE_ASSERT(
verify_authority(id(db()), authority::active) ||
verify_authority(id(db()), authority::owner),
tx_missing_active_auth,
"missing required active authority ${id}", ("id", id));
}
for( auto id : owner_auths )
{
GRAPHENE_ASSERT(
verify_authority(id(db()), authority::owner),
tx_missing_owner_auth,
"missing required owner authority ${id}", ("id", id));
}
for( const auto& auth : other_auths )
{
GRAPHENE_ASSERT(
trx_state->check_authority(auth),
tx_missing_other_auth,
"missing required authority ${auth}",
("auth",auth)("sigs",trx_state->_sigs));
}
} FC_CAPTURE_AND_RETHROW( (op) ) }

9
libraries/chain/include/graphene/chain/exceptions.hpp
View file

@ -20,11 +20,12 @@
#include <fc/exception/exception.hpp>
#include <graphene/chain/operations.hpp>
#define GRAPHENE_ASSERT( expr, exc_type, ... ) \
#define GRAPHENE_ASSERT( expr, exc_type, FORMAT, ... ) \
FC_MULTILINE_MACRO_BEGIN \
if( !(expr) ) \
{ \
FC_THROW_EXCEPTION( exc_type, __VA_ARGS__ ); \
}
FC_THROW_EXCEPTION( exc_type, FORMAT, __VA_ARGS__ ); \
FC_MULTILINE_MACRO_END
#define GRAPHENE_DECLARE_OP_BASE_EXCEPTIONS( op_name ) \
FC_DECLARE_DERIVED_EXCEPTION( \