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

Compile fixes for win32 and out-of-source builds

Browse source
This commit is contained in:
Eric Frias 2016-02-17 09:17:00 -05:00
parent 2f941c718f
commit d3c6cbf4de
7 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/chain/CMakeLists.txt
View file

@ -1,6 +1,6 @@
add_custom_target( build_hardfork_hpp
COMMAND cat-parts hardfork.d "${CMAKE_CURRENT_BINARY_DIR}/include/graphene/chain/hardfork.hpp" )
COMMAND cat-parts "${CMAKE_CURRENT_SOURCE_DIR}/hardfork.d" "${CMAKE_CURRENT_BINARY_DIR}/include/graphene/chain/hardfork.hpp" )
set_source_files_properties( "${CMAKE_CURRENT_BINARY_DIR}/include/graphene/chain/hardfork.hpp" PROPERTIES GENERATED TRUE )
add_dependencies( build_hardfork_hpp cat-parts )

1
libraries/chain/db_block.cpp
View file

@ -34,6 +34,7 @@
#include <graphene/chain/witness_object.hpp>
#include <graphene/chain/protocol/fee_schedule.hpp>
#include <graphene/chain/exceptions.hpp>
#include <graphene/chain/evaluator.hpp>
namespace graphene { namespace chain {

3
libraries/chain/include/graphene/chain/database.hpp
View file

@ -22,7 +22,6 @@
* THE SOFTWARE.
*/
#pragma once
#include <graphene/chain/evaluator.hpp>
#include <graphene/chain/global_property_object.hpp>
#include <graphene/chain/node_property_object.hpp>
#include <graphene/chain/account_object.hpp>
@ -45,6 +44,8 @@
namespace graphene { namespace chain {
using graphene::db::abstract_object;
using graphene::db::object;
class op_evaluator;
class transaction_evaluation_state;
struct budget_record;

1
libraries/chain/include/graphene/chain/evaluator.hpp
View file

@ -25,6 +25,7 @@
#include <graphene/chain/exceptions.hpp>
#include <graphene/chain/transaction_evaluation_state.hpp>
#include <graphene/chain/protocol/operations.hpp>
#include <graphene/chain/database.hpp>
namespace graphene { namespace chain {

1
libraries/chain/protocol/fee_schedule.cpp
View file

@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include <algorithm>
#include <graphene/chain/protocol/fee_schedule.hpp>
#include <fc/smart_ref_impl.hpp>

1
programs/build_helpers/cat-parts.cpp
View file

@ -62,6 +62,7 @@ int main( int argc, char** argv, char** envp )
}
{
boost::filesystem::create_directories(opath.parent_path());
boost::filesystem::ofstream ofs(opath);
ofs.write( new_data.c_str(), new_data.length() );
}

1
tests/tests/fee_tests.cpp
View file

@ -32,6 +32,7 @@
#include <graphene/chain/fba_object.hpp>
#include <graphene/chain/market_object.hpp>
#include <graphene/chain/vesting_balance_object.hpp>
#include <graphene/chain/exceptions.hpp>
#include <boost/test/unit_test.hpp>