You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by is...@apache.org on 2022/09/26 20:33:49 UTC

[ignite-3] branch ignite-17424 created (now a75de0cc7a)

This is an automated email from the ASF dual-hosted git repository.

isapego pushed a change to branch ignite-17424
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


      at a75de0cc7a IGNITE-17424 Conan fix

This branch includes the following new commits:

     new a75de0cc7a IGNITE-17424 Conan fix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[ignite-3] 01/01: IGNITE-17424 Conan fix

Posted by is...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

isapego pushed a commit to branch ignite-17424
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit a75de0cc7a6c8b4a723b1ec2ee84fcd9cbd014aa
Author: Igor Sapego <is...@apache.org>
AuthorDate: Tue Sep 27 00:33:11 2022 +0400

    IGNITE-17424 Conan fix
---
 modules/platforms/cpp/CMakeLists.txt          | 1 -
 modules/platforms/cpp/conanfile.txt           | 2 --
 modules/platforms/cpp/protocol/src/buffer.cpp | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/modules/platforms/cpp/CMakeLists.txt b/modules/platforms/cpp/CMakeLists.txt
index 77a8c9acc6..9608b39983 100644
--- a/modules/platforms/cpp/CMakeLists.txt
+++ b/modules/platforms/cpp/CMakeLists.txt
@@ -25,7 +25,6 @@ set(CMAKE_PROJECT_VERSION ${PROJECT_VERSION})
 
 if(EXISTS ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
     message(STATUS "Conan detected. Enabling...")
-    include(${CMAKE_BINARY_DIR}/conan_toolchain.cmake)
     include(${CMAKE_BINARY_DIR}/conan_paths.cmake)
     include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
     conan_basic_setup()
diff --git a/modules/platforms/cpp/conanfile.txt b/modules/platforms/cpp/conanfile.txt
index 7ffdedbf01..5fee4e281d 100644
--- a/modules/platforms/cpp/conanfile.txt
+++ b/modules/platforms/cpp/conanfile.txt
@@ -4,8 +4,6 @@ gtest/1.12.1
 boost/1.72.0
 
 [generators]
-CMakeDeps
-CMakeToolchain
 cmake_find_package
 cmake_paths
 cmake
diff --git a/modules/platforms/cpp/protocol/src/buffer.cpp b/modules/platforms/cpp/protocol/src/buffer.cpp
index 0ec5c523fc..292fd16a6b 100644
--- a/modules/platforms/cpp/protocol/src/buffer.cpp
+++ b/modules/platforms/cpp/protocol/src/buffer.cpp
@@ -30,7 +30,7 @@ Buffer::Buffer() :
     m_buffer(),
     m_lengthPos(std::numeric_limits<std::size_t>::max()) { }
 
-    [[maybe_unused]] Buffer::Buffer(std::vector<std::byte> data) :
+Buffer::Buffer(std::vector<std::byte> data) :
     m_buffer(std::move(data)),
     m_lengthPos(std::numeric_limits<std::size_t>::max()) { }