diff --git a/recipes/reflect-cpp/all/conandata.yml b/recipes/reflect-cpp/all/conandata.yml index 2e2f0acc4394e..99aed4ef3704c 100644 --- a/recipes/reflect-cpp/all/conandata.yml +++ b/recipes/reflect-cpp/all/conandata.yml @@ -5,9 +5,3 @@ sources: "0.6.0": url: "https://github.com/getml/reflect-cpp/archive/v0.6.0.tar.gz" sha256: "D8231B91989397A67E841B56A0673FDCDF969DBE956D54BB629F14100B030664" -patches: - "0.9.0": - - patch_file: "patches/9.0.0-fix-msvc-error.patch" - patch_description: "fix MSVC compilation error" - patch_type: "portability" - patch_source: "https://github.com/getml/reflect-cpp/pull/91" diff --git a/recipes/reflect-cpp/all/conanfile.py b/recipes/reflect-cpp/all/conanfile.py index 8ab0e163c2393..ddf0ede842e03 100644 --- a/recipes/reflect-cpp/all/conanfile.py +++ b/recipes/reflect-cpp/all/conanfile.py @@ -1,6 +1,6 @@ from conan import ConanFile from conan.errors import ConanInvalidConfiguration -from conan.tools.files import get, copy, export_conandata_patches, apply_conandata_patches +from conan.tools.files import get, copy from conan.tools.build import check_min_cppstd from conan.tools.scm import Version from conan.tools.layout import basic_layout @@ -44,9 +44,6 @@ def _compilers_minimum_version(self): "apple-clang": "15", } - def export_sources(self): - export_conandata_patches(self) - def layout(self): basic_layout(self, src_folder="src") @@ -75,9 +72,6 @@ def validate(self): def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) - def build(self): - apply_conandata_patches(self) - def package(self): copy(self, pattern="LICENSE*", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder) copy( diff --git a/recipes/reflect-cpp/all/patches/9.0.0-fix-msvc-error.patch b/recipes/reflect-cpp/all/patches/9.0.0-fix-msvc-error.patch deleted file mode 100644 index 19f7f4b132f28..0000000000000 --- a/recipes/reflect-cpp/all/patches/9.0.0-fix-msvc-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/include/rfl/parsing/NamedTupleParser.hpp b/include/rfl/parsing/NamedTupleParser.hpp -index cfc19ae..921b9b6 100644 ---- a/include/rfl/parsing/NamedTupleParser.hpp -+++ b/include/rfl/parsing/NamedTupleParser.hpp -@@ -92,11 +92,11 @@ struct NamedTupleParser { - std::map _values = {}) { - using Type = schema::Type; - using T = NamedTuple; - constexpr size_t size = T::size(); - if constexpr (_i == size) { - return Type{Type::Object{_values}}; - } else { -- using F = std::tuple_element_t<_i, typename T::Fields>; -+ using F = std::tuple_element_t<_i, typename NamedTuple::Fields>; - _values[std::string(F::name())] = - Parser::to_schema(_definitions); - return to_schema<_i + 1>(_definitions, _values);