fix linking error, add protobuf dependency, fix bug (hyperledger-iroh…

…a#1442) Signed-off-by: Victor Drobny <[email protected]>
AndreyAndreyev · Jun 9, 2018 · 8b71dae · 8b71dae
1 parent 7135750
commit 8b71dae
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/irohad/execution/CMakeLists.txt b/irohad/execution/CMakeLists.txt
@@ -18,6 +18,7 @@ add_library(common_execution
 target_link_libraries(common_execution
         rxcpp
         boost
+        shared_model_proto_backend
         )
 
 add_library(command_execution

diff --git a/shared_model/backend/protobuf/query_responses/impl/proto_block_query_response.cpp b/shared_model/backend/protobuf/query_responses/impl/proto_block_query_response.cpp
@@ -29,7 +29,7 @@ namespace shared_model {
     template BlockQueryResponse::BlockQueryResponse(
         const BlockQueryResponse::TransportType &);
     template BlockQueryResponse::BlockQueryResponse(
-        const BlockQueryResponse::TransportType &&);
+        BlockQueryResponse::TransportType &&);
 
     BlockQueryResponse::BlockQueryResponse(const BlockQueryResponse &o)
         : BlockQueryResponse(o.proto_) {}

diff --git a/shared_model/backend/protobuf/query_responses/impl/proto_block_response.cpp b/shared_model/backend/protobuf/query_responses/impl/proto_block_response.cpp
@@ -21,7 +21,7 @@ namespace shared_model {
     BlockResponse::BlockResponse(const BlockResponse &o)
         : BlockResponse(o.proto_) {}
 
-    BlockResponse::BlockResponse(BlockResponse &&o)
+    BlockResponse::BlockResponse(BlockResponse &&o) noexcept
         : BlockResponse(std::move(o.proto_)) {}
 
     const Block &BlockResponse::block() const {

diff --git a/shared_model/backend/protobuf/query_responses/proto_block_response.hpp b/shared_model/backend/protobuf/query_responses/proto_block_response.hpp
@@ -24,15 +24,15 @@ namespace shared_model {
 
       BlockResponse(const BlockResponse &o);
 
-      BlockResponse(BlockResponse &&o);
+      BlockResponse(BlockResponse &&o) noexcept;
 
       const Block &block() const override;
 
      private:
       template <typename T>
       using Lazy = detail::LazyInitializer<T>;
 
-      const iroha::protocol::BlockResponse block_response_;
+      const iroha::protocol::BlockResponse &block_response_;
 
       const Lazy<Block> block_;
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ add_library(common_execution @@
     target_link_libraries(common_execution
             rxcpp
             boost
+            shared_model_proto_backend
             )
     add_library(command_execution
@@ Expand Down @@