Skip to content

Commit c3da851

Browse files
liuzicheng1987liuzicheng1987
committed
Renamed the flag
1 parent e64f181 commit c3da851

12 files changed

Lines changed: 30 additions & 22 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ option(REFLECTCPP_CHECK_HEADERS "Make sure that all headers are self-contained"
3030

3131
option(REFLECTCPP_USE_BUNDLED_DEPENDENCIES "Use the bundled dependencies" ON)
3232

33-
option(REFLECTCPP_USE_CPP_REFLECTION "Use standard C++ reflection (requires C++-26)" OFF)
34-
option(REFLECTCPP_USE_STD_EXPECTED "Use std::expected instead of the built-in Result type (requires C++-23)" ${REFLECTCPP_USE_CPP_REFLECTION})
33+
option(REFLECTCPP_USE_CPP26_REFLECTION "Use standard C++ reflection (requires C++-26)" OFF)
34+
option(REFLECTCPP_USE_STD_EXPECTED "Use std::expected instead of the built-in Result type (requires C++-23)" ${REFLECTCPP_USE_CPP26_REFLECTION})
3535

36-
if(REFLECTCPP_USE_CPP_REFLECTION)
36+
if(REFLECTCPP_USE_CPP26_REFLECTION)
3737
if(NOT DEFINED CMAKE_CXX_STANDARD)
3838
set(CMAKE_CXX_STANDARD 26)
3939
endif()
@@ -234,8 +234,8 @@ if(REFLECTCPP_BUILD_SHARED)
234234
target_compile_definitions(reflectcpp PUBLIC RFL_BUILD_SHARED)
235235
endif()
236236

237-
if(REFLECTCPP_USE_CPP_REFLECTION)
238-
target_compile_definitions(reflectcpp PUBLIC REFLECTCPP_USE_CPP_REFLECTION)
237+
if(REFLECTCPP_USE_CPP26_REFLECTION)
238+
target_compile_definitions(reflectcpp PUBLIC REFLECTCPP_USE_CPP26_REFLECTION)
239239
endif()
240240

241241
if(REFLECTCPP_USE_STD_EXPECTED)

‎include/rfl/internal/bind_to_tuple.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_BIND_TO_TUPLE_HPP_
22
#define RFL_INTERNAL_BIND_TO_TUPLE_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/bind_to_tuple.hpp"
66
#else
77
#include "cpp26/bind_to_tuple.hpp"
@@ -11,7 +11,7 @@ namespace rfl::internal {
1111

1212
template <class T>
1313
auto bind_to_tuple(T& _t) {
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::bind_to_tuple(_t);
1616
#else
1717
return cpp26::bind_to_tuple(_t);

‎include/rfl/internal/enums/from_string.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_ENUMS_FROM_STRING_HPP_
22
#define RFL_INTERNAL_ENUMS_FROM_STRING_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/from_string.hpp"
66
#else
77
#include "cpp26/from_string.hpp"
@@ -11,7 +11,7 @@ namespace rfl::internal::enums {
1111

1212
template <class EnumType>
1313
auto from_string(const std::string& _str) {
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::from_string<EnumType>(_str);
1616
#else
1717
return cpp26::from_string<EnumType>(_str);

‎include/rfl/internal/enums/get_enum_names.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_ENUMS_GET_ENUM_NAMES_HPP_
22
#define RFL_INTERNAL_ENUMS_GET_ENUM_NAMES_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/get_enum_names.hpp"
66
#else
77
#include "cpp26/get_enum_names.hpp"
@@ -11,7 +11,7 @@ namespace rfl::internal::enums {
1111

1212
template <class EnumType>
1313
consteval auto get_enum_names() {
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::get_enum_names<EnumType>();
1616
#else
1717
return cpp26::get_enum_names<EnumType>();

‎include/rfl/internal/enums/get_enum_range.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_ENUMS_GET_ENUM_RANGE_HPP_
22
#define RFL_INTERNAL_ENUMS_GET_ENUM_RANGE_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/get_enum_range.hpp"
66
#else
77
#include "cpp26/get_enum_range.hpp"
@@ -11,7 +11,7 @@ namespace rfl::internal::enums {
1111

1212
template <class EnumType>
1313
constexpr auto get_enum_range() {
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::get_enum_range<EnumType>();
1616
#else
1717
return cpp26::get_enum_range<EnumType>();

‎include/rfl/internal/enums/to_string.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_ENUMS_TO_STRING_OR_NUMBER_HPP_
22
#define RFL_INTERNAL_ENUMS_TO_STRING_OR_NUMBER_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/to_string.hpp"
66
#else
77
#include "cpp26/to_string.hpp"
@@ -11,7 +11,7 @@ namespace rfl::internal::enums {
1111

1212
template <class EnumType>
1313
auto to_string(const EnumType e) {
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::to_string(e);
1616
#else
1717
return cpp26::to_string(e);

‎include/rfl/internal/get_field_names.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_GETFIELDNAMES_HPP_
22
#define RFL_INTERNAL_GETFIELDNAMES_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/get_field_names.hpp"
66
#else
77
#include "cpp26/get_field_names.hpp"
@@ -11,7 +11,7 @@ namespace rfl::internal {
1111

1212
template <class T>
1313
auto get_field_names() {
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::get_field_names<T>();
1616
#else
1717
return cpp26::get_field_names<T>();

‎include/rfl/internal/get_type_name.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_INTERNAL_GETTYPENAME_HPP_
22
#define RFL_INTERNAL_GETTYPENAME_HPP_
33
// TODO
4-
// #ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
// #ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "cpp20/get_type_name.hpp"
66
// #else
77
// TODO
@@ -11,7 +11,7 @@ namespace rfl::internal {
1111

1212
template <class T>
1313
consteval auto get_type_name() {
14-
// #ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
// #ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
return cpp20::get_type_name<T>();
1616
// #else
1717
// TODO

‎include/rfl/num_fields.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef RFL_NUM_FIELDS_HPP_
22
#define RFL_NUM_FIELDS_HPP_
33

4-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
4+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
55
#include "internal/cpp20/num_fields.hpp"
66
#else
77
#include "internal/cpp26/num_fields.hpp"
@@ -11,7 +11,7 @@ namespace rfl {
1111

1212
/// Returns the number of fields in struct T at compile time.
1313
/// @tparam T The struct type to count fields for
14-
#ifndef REFLECTCPP_USE_CPP_REFLECTION
14+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
1515
template <class T>
1616
constexpr std::size_t num_fields = internal::cpp20::num_fields<T>;
1717
#else

‎tests/generic/test_enum_range_min_max.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#ifndef REFLECTCPP_USE_CPP26_REFLECTION
2+
13
#include <gtest/gtest.h>
24
// Redefine the range of the enums
35
#define RFL_ENUM_RANGE_MIN -128
@@ -36,3 +38,5 @@ TEST(generic, test_enum_range_min_max) {
3638
}
3739

3840
} // namespace test_enum_range_min_max
41+
42+
#endif

0 commit comments

Comments
 (0)