From d3c6cbf4de72a8d8003ffdb178e6ec3206062058 Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Wed, 17 Feb 2016 09:17:00 -0500
Subject: [PATCH] Compile fixes for win32 and out-of-source builds

---
 libraries/chain/CMakeLists.txt                       | 2 +-
 libraries/chain/db_block.cpp                         | 1 +
 libraries/chain/include/graphene/chain/database.hpp  | 3 ++-
 libraries/chain/include/graphene/chain/evaluator.hpp | 1 +
 libraries/chain/protocol/fee_schedule.cpp            | 1 +
 programs/build_helpers/cat-parts.cpp                 | 1 +
 tests/tests/fee_tests.cpp                            | 1 +
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/libraries/chain/CMakeLists.txt b/libraries/chain/CMakeLists.txt
index c38bd80b..9cc4285d 100644
--- a/libraries/chain/CMakeLists.txt
+++ b/libraries/chain/CMakeLists.txt
@@ -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 )
diff --git a/libraries/chain/db_block.cpp b/libraries/chain/db_block.cpp
index d7c1e214..e141cd08 100644
--- a/libraries/chain/db_block.cpp
+++ b/libraries/chain/db_block.cpp
@@ -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 {
 
diff --git a/libraries/chain/include/graphene/chain/database.hpp b/libraries/chain/include/graphene/chain/database.hpp
index 1f563995..199acb39 100644
--- a/libraries/chain/include/graphene/chain/database.hpp
+++ b/libraries/chain/include/graphene/chain/database.hpp
@@ -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;
 
diff --git a/libraries/chain/include/graphene/chain/evaluator.hpp b/libraries/chain/include/graphene/chain/evaluator.hpp
index 64205b80..f0369533 100644
--- a/libraries/chain/include/graphene/chain/evaluator.hpp
+++ b/libraries/chain/include/graphene/chain/evaluator.hpp
@@ -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 {
 
diff --git a/libraries/chain/protocol/fee_schedule.cpp b/libraries/chain/protocol/fee_schedule.cpp
index 993df085..334f33f1 100644
--- a/libraries/chain/protocol/fee_schedule.cpp
+++ b/libraries/chain/protocol/fee_schedule.cpp
@@ -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>
 
diff --git a/programs/build_helpers/cat-parts.cpp b/programs/build_helpers/cat-parts.cpp
index 0f06d2dc..13e692fe 100644
--- a/programs/build_helpers/cat-parts.cpp
+++ b/programs/build_helpers/cat-parts.cpp
@@ -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() );
       }
diff --git a/tests/tests/fee_tests.cpp b/tests/tests/fee_tests.cpp
index e6fd6748..984c6fce 100644
--- a/tests/tests/fee_tests.cpp
+++ b/tests/tests/fee_tests.cpp
@@ -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>