Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +4 -1
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7d7872cb7b - Show all commits

2
CMakeLists.txt
View file

@ -4,6 +4,8 @@
PROJECT( fc ) PROJECT( fc )
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 ) CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
add_compile_options(-std=c++14)
MESSAGE(STATUS "Configuring project fc located in: ${CMAKE_CURRENT_SOURCE_DIR}") MESSAGE(STATUS "Configuring project fc located in: ${CMAKE_CURRENT_SOURCE_DIR}")
SET( CMAKE_AUTOMOC OFF ) SET( CMAKE_AUTOMOC OFF )

1
include/fc/static_variant.hpp
View file

@ -328,6 +328,7 @@ public:
static int count() { return impl::type_info<Types...>::count; } static int count() { return impl::type_info<Types...>::count; }
void set_which( tag_type w ) { void set_which( tag_type w ) {
FC_ASSERT( w >= 0 );
FC_ASSERT( w < count() ); FC_ASSERT( w < count() );
this->~static_variant(); this->~static_variant();
_tag = w; _tag = w;

2
src/thread/mutex.cpp
View file

@ -15,9 +15,9 @@ namespace fc {
mutex::~mutex() { mutex::~mutex() {
if( m_blist ) if( m_blist )
{ {
// context* c = m_blist;
fc::thread::current().debug("~mutex"); fc::thread::current().debug("~mutex");
#if 0 #if 0
context* c = m_blist;
while( c ) { while( c ) {
// elog( "still blocking on context %p (%s)", m_blist, (m_blist->cur_task ? m_blist->cur_task->get_desc() : "no current task") ); // elog( "still blocking on context %p (%s)", m_blist, (m_blist->cur_task ? m_blist->cur_task->get_desc() : "no current task") );
c = c->next_blocked_mutex; c = c->next_blocked_mutex;