Skip to content

Commit

Permalink
Fix CMake option docs and remove commented out code
Browse files Browse the repository at this point in the history
  • Loading branch information
@mvandeberg
mvandeberg committed May 10, 2019
1 parent c2990b4 commit bac7c5a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 84 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ if( ENABLE_SMT_SUPPORT )
SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTEEM_ENABLE_SMT" )
endif()

OPTION( ENABLE_MIRA "Build source with STD allocator (ON OR OFF)" OFF )
OPTION( ENABLE_MIRA "Build source with MIRA (ON OR OFF)" OFF )
MESSAGE( STATUS "ENABLE_MIRA: ${ENABLE_MIRA}" )
if( ENABLE_MIRA )
MESSAGE( STATUS " " )
Expand Down Expand Up @@ -332,7 +332,7 @@ endif()
if( ENABLE_MIRA )
MESSAGE( STATUS "\n\n CONFIGURED FOR MIRA \n\n" )
else()
MESSAGE( STATUS "\n\n CONFIGURED FOR BMIP MMAP \n\n" )
MESSAGE( STATUS "\n\n CONFIGURED FOR BMIC MMAP \n\n" )
endif()

if( LOW_MEMORY_NODE )
Expand Down
1 change: 0 additions & 1 deletion libraries/chain/include/steem/chain/index.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ void _add_index_impl( database& db )
template< typename MultiIndexType >
void add_core_index( database& db )
{
//_add_index_impl< typename mira::adapter_conversion< MultiIndexType >::mira_type >(db);
_add_index_impl< MultiIndexType >( db );
}

Expand Down
45 changes: 1 addition & 44 deletions libraries/chain/include/steem/chain/multi_index_types.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,6 @@ using boost::multi_index::composite_key;
using boost::multi_index::composite_key_compare;
using boost::multi_index::const_mem_fun;
#else
/*
template< typename... Args >
using multi_index_container = mira::boost_multi_index_adapter< Args... >;
using boost::multi_index::indexed_by;
using boost::multi_index::ordered_unique;
using boost::multi_index::tag;
using boost::multi_index::member;
using boost::multi_index::composite_key;
using boost::multi_index::composite_key_compare;
using boost::multi_index::const_mem_fun;
//*/
//*
template< typename... Args >
using multi_index_container = mira::multi_index_adapter< Args... >;
using mira::multi_index::indexed_by;
Expand All @@ -56,7 +44,7 @@ using mira::multi_index::member;
using mira::multi_index::composite_key;
using mira::multi_index::composite_key_compare;
using mira::multi_index::const_mem_fun;
//*/

template< typename T1, typename T2, typename T3 >
class bmic_type : public ::mira::boost_multi_index_adapter< T1, T2, T3 >
{
Expand All @@ -72,36 +60,5 @@ class mira_type : public ::mira::multi_index_container< T1, T2, T3 >
};

#endif
/*
template< typename... Args >
using indexed_by = typename std::conditional< false, ::mira::multi_index::indexed_by< Args ... >, ::boost::multi_index::indexed_by< Args ... > >;
template< typename... Args >
using ordered_unique = typename std::conditional< false, ::mira::multi_index::ordered_unique< Args ... >, ::boost::multi_index::ordered_unique< Args ... > >;
template < typename T >
using tag = typename std::conditional< false, ::mira::multi_index::tag< T >, ::boost::multi_index::tag< T > >;
template< class Class, typename Type, Type Class::*PtrToMember >
using member = typename std::conditional< false, ::mira::multi_index::member< Class, Type, PtrToMember >, ::boost::multi_index::member< Class, Type, PtrToMember > >;
template< typename... Args >
using composite_key = typename std::conditional< false, ::mira::multi_index::composite_key< Args ... >, ::boost::multi_index::composite_key< Args ... > >;
template< typename... Args >
using composite_key_compare = typename std::conditional< false, ::mira::multi_index::composite_key_compare< Args ... >, ::boost::multi_index::composite_key_compare< Args ... > >;
template< class Class, typename Type, Type (Class::*PtrToMemberFunction)()const >
using const_mem_fun = typename std::conditional< false, ::mira::multi_index::const_mem_fun< Class, Type, PtrToMemberFunction >, ::boost::multi_index::const_mem_fun< Class, Type, PtrToMemberFunction > >;
*/

/*
template< typename Value, typename IndexSpecifierList, typename Allocator >
class multi_index_container : public mira_type< Value, IndexSpecifierList, Allocator >
{
public:
using mira_type< Value, IndexSpecifierList, Allocator >::mira_type;
};
*/

} } // steem::chain
37 changes: 0 additions & 37 deletions libraries/chain/index.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,6 @@ namespace steem { namespace chain {

void initialize_core_indexes( database& db )
{
/*
add_core_index< typename mira::adapter_conversion< dynamic_global_property_index >::bmic_type >( db );
add_core_index< typename mira::adapter_conversion< account_index >::bmic_type >( db );
//add_core_index< typename mira::adapter_conversion< account_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< account_metadata_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< account_authority_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< witness_index >::bmic_type >( db );
//add_core_index< typename mira::adapter_conversion< witness_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< transaction_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< block_summary_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< witness_schedule_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< comment_index >::bmic_type >( db );
//add_core_index< typename mira::adapter_conversion< comment_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< comment_content_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< comment_vote_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< witness_vote_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< limit_order_index >::bmic_type >( db );
//add_core_index< typename mira::adapter_conversion< limit_order_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< feed_history_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< convert_request_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< liquidity_reward_balance_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< operation_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< account_history_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< hardfork_property_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< withdraw_vesting_route_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< owner_authority_history_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< account_recovery_request_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< change_recovery_account_request_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< escrow_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< savings_withdraw_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< decline_voting_rights_request_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< reward_fund_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< vesting_delegation_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< vesting_delegation_expiration_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< pending_required_action_index >::mira_type >( db );
add_core_index< typename mira::adapter_conversion< pending_optional_action_index >::mira_type >( db );
*/
add_core_index< dynamic_global_property_index >( db );
add_core_index< account_index >( db );
add_core_index< account_metadata_index >( db );
Expand Down

0 comments on commit bac7c5a

Please sign in to comment.