Merge pull request #229 from offa/217-cpp20

Update to C++20

Author: offa

.github/workflows/ci.yml

@@ -100,7 +100,7 @@ jobs:
           conan profile detect
           echo "tools.cmake.cmaketoolchain:generator=Ninja" >> ~/.conan2/global.conf
           mkdir build
-          conan install -o "influxdb_cxx/*":boost=${{ matrix.boost }} -o "influxdb_cxx/*":tests=True -s compiler.cppstd=17 --build=missing . -of build
+          conan install -o "influxdb_cxx/*":boost=${{ matrix.boost }} -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build
           conan install --build=missing -of build --requires "libcurl/7.87.0" --deployer full_deploy
       - name: Build
         run: |
@@ -128,7 +128,7 @@ jobs:
           brew install boost
           conan profile detect
           mkdir build
-          conan install -o "influxdb_cxx/*":system=True -o "influxdb_cxx/*":tests=True -s compiler.cppstd=17 --build=missing . -of build
+          conan install -o "influxdb_cxx/*":system=True -o "influxdb_cxx/*":tests=True -s compiler.cppstd=20 --build=missing . -of build
       - name: Build
         run: script/ci_build.sh
       - name: Install

.github/workflows/systemtest.yml

@@ -36,7 +36,9 @@ jobs:
       - name: Setup
         run: |
           script/ci_setup.sh
-          apt-get install -y libboost-system-dev
+          add-apt-repository ppa:nicola-onorata/toolchain
+          apt-get update
+          apt-get install -y boost1.81
       - name: Build
         run: |
           cmake --preset conan-release

CMakeLists.txt

@@ -44,7 +44,7 @@ if(NOT MSVC AND NOT INCLUDED_AS_SUBPROJECT)
       )
 endif()
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 # We explicitly export the public interface

README.md

@@ -3,7 +3,7 @@
 [![ci](https://github.com/offa/influxdb-cxx/actions/workflows/ci.yml/badge.svg)](https://github.com/offa/influxdb-cxx/actions/workflows/ci.yml)
 [![GitHub release](https://img.shields.io/github/release/offa/influxdb-cxx.svg)](https://github.com/offa/influxdb-cxx/releases)
 [![License](https://img.shields.io/badge/license-MIT-yellow.svg)](LICENSE)
-![C++](https://img.shields.io/badge/c++-17-green.svg)
+![C++](https://img.shields.io/badge/c++-20-green.svg)
 [![Conan Center](https://img.shields.io/conan/v/influxdb-cxx)](https://conan.io/center/recipes/influxdb-cxx)
 
 InfluxDB C++ client library
@@ -21,11 +21,11 @@ InfluxDB C++ client library
 
 ### Build requirements
  - CMake 3.12+
- - C++17 compiler
+ - C++20 compiler
 
 ### Dependencies
  - [**cpr**](https://github.com/libcpr/cpr) (required)<sup>i)</sup>
- - **boost 1.66+** (optional – see [Transports](#transports))
+ - **boost 1.78+** (optional – see [Transports](#transports))
 
  <sup>i)</sup> *cpr* needs to provide [CMake support](https://github.com/libcpr/cpr#find_package); some systems need to call `ldconfig` after *.so* installation.
 

include/Point.h

@@ -33,7 +33,6 @@
 #include <chrono>
 #include <variant>
 #include <deque>
-#include <type_traits>
 
 #include "influxdb_export.h"
 
@@ -56,12 +55,6 @@ namespace influxdb
         using FieldValue = std::variant<int, long long int, std::string, double, bool, unsigned int, unsigned long long int>;
         Point&& addField(std::string_view name, const FieldValue& value);
 
-        template <class T, class = std::enable_if_t<std::is_same_v<T, const char*>, int>>
-        Point&& addField(std::string_view name, T value)
-        {
-            return this->addField(name, std::string{value});
-        }
-
         /// Sets custom timestamp
         Point&& setTimestamp(std::chrono::time_point<std::chrono::system_clock> timestamp);
 

script/ci_setup.sh

@@ -22,6 +22,6 @@ conan install \
     -of . \
     -o "influxdb_cxx/*":system=True \
     -o "influxdb_cxx/*":tests=True \
-    -s compiler.cppstd=17 \
+    -s compiler.cppstd=20 \
     --build=missing \
     ..

script/ci_testdeploy.sh

@@ -20,7 +20,7 @@ conan install \
     -g CMakeDeps \
     --build=missing \
     -s build_type=${BUILD_TYPE} \
-    -s compiler.cppstd=17 \
+    -s compiler.cppstd=20 \
     --requires=cpr/1.10.0
 
 cmake -DCMAKE_TOOLCHAIN_FILE=./conan_toolchain.cmake -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" "$@" ..

src/CMakeLists.txt

@@ -87,5 +87,4 @@ target_link_libraries(InfluxDB
     Threads::Threads
 )
 
-# Use C++17
 target_compile_features(InfluxDB PUBLIC cxx_std_${CMAKE_CXX_STANDARD})

test_package/CMakeLists.txt

@@ -5,4 +5,4 @@ find_package(InfluxDB REQUIRED)
 
 add_executable(test_package example.cpp)
 target_link_libraries(test_package PRIVATE InfluxData::InfluxDB)
-target_compile_features(test_package PRIVATE cxx_std_17)
+target_compile_features(test_package PRIVATE cxx_std_20)