Skip to content

Commit fe2a720

Browse files
JohanMabilleJohanMabille
committed
Migrated to C++17 and replaced backported features with standard ones
1 parent d4f27f3 commit fe2a720

14 files changed

Lines changed: 90 additions & 352 deletions

‎CMakeLists.txt‎

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# The full license is in the file LICENSE, distributed with this software. #
88
############################################################################
99

10-
cmake_minimum_required(VERSION 3.5)
10+
cmake_minimum_required(VERSION 3.29)
1111
project(xtl)
1212

1313
set(XTL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
@@ -37,7 +37,6 @@ endif()
3737
# =====
3838

3939
set(XTL_HEADERS
40-
${XTL_INCLUDE_DIR}/xtl/xany.hpp
4140
${XTL_INCLUDE_DIR}/xtl/xbasic_fixed_string.hpp
4241
${XTL_INCLUDE_DIR}/xtl/xbase64.hpp
4342
${XTL_INCLUDE_DIR}/xtl/xclosure.hpp
@@ -67,8 +66,6 @@ set(XTL_HEADERS
6766
${XTL_INCLUDE_DIR}/xtl/xsystem.hpp
6867
${XTL_INCLUDE_DIR}/xtl/xtl_config.hpp
6968
${XTL_INCLUDE_DIR}/xtl/xtype_traits.hpp
70-
${XTL_INCLUDE_DIR}/xtl/xvariant.hpp
71-
${XTL_INCLUDE_DIR}/xtl/xvariant_impl.hpp
7269
${XTL_INCLUDE_DIR}/xtl/xvisitor.hpp
7370
)
7471

@@ -78,13 +75,11 @@ target_include_directories(xtl INTERFACE
7875
$<BUILD_INTERFACE:${XTL_INCLUDE_DIR}>
7976
$<INSTALL_INTERFACE:include>)
8077

81-
if(NOT (CMAKE_VERSION VERSION_LESS 3.15)) # CMake >= 3.15
8278
set_target_properties(xtl
8379
PROPERTIES
8480
PUBLIC_HEADER "${XTL_HEADERS}")
85-
endif()
8681

87-
target_compile_features(xtl INTERFACE cxx_std_14)
82+
target_compile_features(xtl INTERFACE cxx_std_17)
8883

8984
option(BUILD_TESTS "xtl test suite" OFF)
9085
option(DOWNLOAD_GTEST "build gtest from downloaded sources" OFF)
@@ -101,24 +96,14 @@ endif()
10196
include(GNUInstallDirs)
10297
include(CMakePackageConfigHelpers)
10398

104-
if(CMAKE_VERSION VERSION_LESS 3.15) # CMake < 3.15
105-
install(TARGETS xtl
106-
EXPORT ${PROJECT_NAME}-targets)
107-
else()
10899
install(TARGETS xtl
109100
EXPORT ${PROJECT_NAME}-targets
110101
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME})
111-
endif()
112102

113103
# Makes the project importable from the build directory
114104
export(EXPORT ${PROJECT_NAME}-targets
115105
FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake")
116106

117-
if(CMAKE_VERSION VERSION_LESS 3.15) # CMake < 3.15
118-
install(FILES ${XTL_HEADERS}
119-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/xtl)
120-
endif()
121-
122107
set(XTL_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME}" CACHE
123108
STRING "install path for xtlConfig.cmake")
124109

@@ -132,16 +117,10 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
132117
set(_XTL_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
133118
unset(CMAKE_SIZEOF_VOID_P)
134119
# ARCH_INDEPENDENT feature was introduced in cmake 3.14
135-
if (${CMAKE_VERSION} VERSION_LESS "3.14.0")
136-
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
137-
VERSION ${${PROJECT_NAME}_VERSION}
138-
COMPATIBILITY AnyNewerVersion)
139-
else ()
140-
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
141-
VERSION ${${PROJECT_NAME}_VERSION}
142-
COMPATIBILITY AnyNewerVersion
143-
ARCH_INDEPENDENT)
144-
endif ()
120+
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
121+
VERSION ${${PROJECT_NAME}_VERSION}
122+
COMPATIBILITY AnyNewerVersion
123+
ARCH_INDEPENDENT)
145124
set(CMAKE_SIZEOF_VOID_P ${_XTL_CMAKE_SIZEOF_VOID_P})
146125
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
147126
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake

‎docs/source/basic_types.rst‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,6 @@
77
Basic types
88
===========
99

10-
any
11-
---
12-
13-
`xtl::any` is a backport of the C++17 class `std::any`. The class describes a
14-
type-safe container for single values of any type:
15-
16-
.. code::
17-
18-
#include <iostream>
19-
#include "xtl/xany.hpp"
20-
21-
xtl::any a = 1;
22-
std::cout << a.type().name() << ": " << xtl::any_cast<int>(a) << std::endl;
23-
// => i: 1
24-
25-
try
26-
{
27-
std::cout << xtl::any_cast<float>(a) << std::endl;
28-
}
29-
catch(const xtl::bad_any_cast& e)
30-
{
31-
std::cout << e.what() << std::endl;
32-
}
33-
// => bad any_cast
34-
35-
a.reset();
36-
std::cout << std::boolalpha << a.empty() << std::endl;
37-
// => true
38-
39-
The API of `xtl::any` is the same as that of `std::any`. Full documentation
40-
can be found on `cppreference <https://en.cppreference.com/w/cpp/utility/any>`_.
41-
4210
xbasic_fixed_string
4311
-------------------
4412

@@ -108,8 +76,3 @@ xoptional
10876

10977
TODO
11078

111-
xvariant
112-
--------
113-
114-
TODO
115-

‎include/xtl/xcomplex.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ namespace xtl
8787
******************/
8888

8989
template <class T>
90-
using is_gen_complex = disjunction<is_complex<std::decay_t<T>>, is_xcomplex<std::decay_t<T>>>;
90+
using is_gen_complex = std::disjunction<is_complex<std::decay_t<T>>, is_xcomplex<std::decay_t<T>>>;
9191

9292
/****************************
9393
* enable / disable complex *
@@ -165,8 +165,8 @@ namespace xtl
165165

166166
template <class OCTR,
167167
std::enable_if_t<
168-
conjunction<
169-
negation<is_gen_complex<OCTR>>,
168+
std::conjunction<
169+
std::negation<is_gen_complex<OCTR>>,
170170
std::is_constructible<CTR, OCTR&&>,
171171
std::is_convertible<OCTR&&, CTR>
172172
>::value,
@@ -179,10 +179,10 @@ namespace xtl
179179

180180
template <class OCTR,
181181
std::enable_if_t<
182-
conjunction<
183-
negation<is_gen_complex<OCTR>>,
182+
std::conjunction<
183+
std::negation<is_gen_complex<OCTR>>,
184184
std::is_constructible<CTR, OCTR&&>,
185-
negation<std::is_convertible<OCTR&&, CTR>>
185+
std::negation<std::is_convertible<OCTR&&, CTR>>
186186
>::value,
187187
bool
188188
> = true>

‎include/xtl/xjson.hpp‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
#include <cstddef>
1919
#include <string>
20-
#include "xtl/xvariant.hpp"
2120
#include "nlohmann/json.hpp"
2221

2322
namespace xtl
@@ -82,17 +81,4 @@ namespace xtl
8281
}
8382
}
8483

85-
// overloading in the mpark namespace because `xtl::variant` is just a typedef on `mpark::variant`
86-
namespace mpark
87-
{
88-
template <class... Ts>
89-
void to_json(nlohmann::json& j, const xtl::variant<Ts...>& data) {
90-
xtl::visit
91-
(
92-
[&j] (const auto & arg) { j = arg; },
93-
data
94-
);
95-
}
96-
}
97-
9884
#endif

‎include/xtl/xmasked_value.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,13 @@ namespace xtl
219219
return lhs.equal(rhs);
220220
}
221221

222-
template <class T1, class T2, class B2, XTL_REQUIRES(negation<is_xmasked_value<T1>>)>
222+
template <class T1, class T2, class B2, XTL_REQUIRES(std::negation<is_xmasked_value<T1>>)>
223223
inline bool operator==(const T1& lhs, const xmasked_value<T2, B2>& rhs) noexcept
224224
{
225225
return rhs.equal(lhs);
226226
}
227227

228-
template <class T1, class B1, class T2, XTL_REQUIRES(negation<is_xmasked_value<T2>>)>
228+
template <class T1, class B1, class T2, XTL_REQUIRES(std::negation<is_xmasked_value<T2>>)>
229229
inline bool operator==(const xmasked_value<T1, B1>& lhs, const T2& rhs) noexcept
230230
{
231231
return lhs.equal(rhs);
@@ -237,13 +237,13 @@ namespace xtl
237237
return !lhs.equal(rhs);
238238
}
239239

240-
template <class T1, class T2, class B2, XTL_REQUIRES(negation<is_xmasked_value<T1>>)>
240+
template <class T1, class T2, class B2, XTL_REQUIRES(std::negation<is_xmasked_value<T1>>)>
241241
inline bool operator!=(const T1& lhs, const xmasked_value<T2, B2>& rhs) noexcept
242242
{
243243
return !rhs.equal(lhs);
244244
}
245245

246-
template <class T1, class B1, class T2, XTL_REQUIRES(negation<is_xmasked_value<T2>>)>
246+
template <class T1, class B1, class T2, XTL_REQUIRES(std::negation<is_xmasked_value<T2>>)>
247247
inline bool operator!=(const xmasked_value<T1, B1>& lhs, const T2& rhs) noexcept
248248
{
249249
return !lhs.equal(rhs);
@@ -308,15 +308,15 @@ namespace xtl
308308
return e1.visible() && e2.visible() ? masked_value(e1.value() OP e2.value()) : masked<value_type>(); \
309309
} \
310310
\
311-
template <class T1, class B1, class T2, XTL_REQUIRES(negation<is_xmasked_value<T2>>)> \
311+
template <class T1, class B1, class T2, XTL_REQUIRES(std::negation<is_xmasked_value<T2>>)> \
312312
inline auto operator OP(const xmasked_value<T1, B1>& e1, const T2& e2) noexcept \
313313
-> xmasked_value<promote_type_t<std::decay_t<T1>, std::decay_t<T2>>> \
314314
{ \
315315
using value_type = promote_type_t<std::decay_t<T1>, std::decay_t<T2>>; \
316316
return e1.visible() ? masked_value(e1.value() OP e2) : masked<value_type>(); \
317317
} \
318318
\
319-
template <class T1, class T2, class B2, XTL_REQUIRES(negation<is_xmasked_value<T1>>)> \
319+
template <class T1, class T2, class B2, XTL_REQUIRES(std::negation<is_xmasked_value<T1>>)> \
320320
inline auto operator OP(const T1& e1, const xmasked_value<T2, B2>& e2) noexcept \
321321
-> xmasked_value<promote_type_t<std::decay_t<T1>, std::decay_t<T2>>> \
322322
{ \
@@ -334,14 +334,14 @@ namespace xtl
334334
masked<decltype(e1.value() OP e2.value())>(); \
335335
} \
336336
\
337-
template <class T1, class B1, class T2, XTL_REQUIRES(negation<is_xmasked_value<T2>>)> \
337+
template <class T1, class B1, class T2, XTL_REQUIRES(std::negation<is_xmasked_value<T2>>)> \
338338
inline auto operator OP(const xmasked_value<T1, B1>& e1, const T2& e2) noexcept \
339339
-> xmasked_value<decltype(e1.value() OP e2)> \
340340
{ \
341341
return e1.visible() ? masked_value(e1.value() OP e2) : masked<decltype(e1.value() OP e2)>(); \
342342
} \
343343
\
344-
template <class T1, class T2, class B2, XTL_REQUIRES(negation<is_xmasked_value<T1>>)> \
344+
template <class T1, class T2, class B2, XTL_REQUIRES(std::negation<is_xmasked_value<T1>>)> \
345345
inline auto operator OP(const T1& e1, const xmasked_value<T2, B2>& e2) noexcept \
346346
-> xmasked_value<decltype(e1 OP e2.value())> \
347347
{ \

‎include/xtl/xmeta_utils.hpp‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@
1919

2020
namespace xtl
2121
{
22-
// TODO move to a xutils if we have one
23-
24-
// gcc 4.9 is affected by C++14 defect CGW 1558
25-
// see http://open-std.org/JTC1/SC22/WG21/docs/cwg_defects.html#1558
26-
template <class... T>
27-
struct make_void
28-
{
29-
using type = void;
30-
};
31-
32-
template <class... T>
33-
using void_t = typename make_void<T...>::type;
34-
3522
namespace mpl
3623
{
3724
/*************
@@ -581,28 +568,6 @@ namespace xtl
581568
template <class L>
582569
using unique_t = typename unique<L>::type;
583570

584-
/*************
585-
* static_if *
586-
*************/
587-
588-
template <class TF, class FF>
589-
decltype(auto) static_if(std::true_type, const TF& tf, const FF&)
590-
{
591-
return tf(identity());
592-
}
593-
594-
template <class TF, class FF>
595-
decltype(auto) static_if(std::false_type, const TF&, const FF& ff)
596-
{
597-
return ff(identity());
598-
}
599-
600-
template <bool cond, class TF, class FF>
601-
decltype(auto) static_if(const TF& tf, const FF& ff)
602-
{
603-
return static_if(std::integral_constant<bool, cond>(), tf, ff);
604-
}
605-
606571
/***********
607572
* switch_ *
608573
***********/

0 commit comments

Comments
 (0)