Some c++20 changes

Author: florianbecker

examples/pipe/main.cpp

@@ -30,15 +30,23 @@
 
 /* stl header */
 #include <iostream>
-#include <vector>
+#if __cplusplus > 201703L
+  #include <span>
+#endif
 
 /* gsl header */
-#include <gsl/gsl>
-#include <gsl/span>
+#if __cplusplus <= 201703L
+  #include <gsl/gsl>
+  #include <gsl/span>
+#endif
 
 int main( int argc, char **argv ) {
 
+#if __cplusplus > 201703L
+  std::span<char *> args = { argv, static_cast<std::size_t>( argc ) };
+#else
   gsl::span<char *> args = { argv, static_cast<std::size_t>( argc ) };
+#endif
 
   /* Usage: pipe RESULTCODE */
   if ( args.size() != 2 ) {
@@ -52,5 +60,9 @@ int main( int argc, char **argv ) {
   fprintf( stderr, "This is fprintf( stderr ) text.\n" );
   printf( "This is printf text.\n" );
 
+#if __cplusplus > 201703L
+  return std::stoi( args[1] );
+#else
   return std::stoi( gsl::at( args, 1 ) );
+#endif
 }

source/Serial.cpp

@@ -36,10 +36,10 @@
 /* system header */
 #include <fcntl.h> // open
 #ifdef _WIN32
-#include <io.h> // write, read, close
+  #include <io.h> // write, read, close
 #else
-#include <termios.h>
-#include <unistd.h> // write, read, close
+  #include <termios.h>
+  #include <unistd.h> // write, read, close
 #endif
 
 /* stl header */

source/templates/Timer.h

@@ -51,8 +51,12 @@ namespace vx {
      * @param _function   Call back function.
      * @param _delay   Delay in milliseconds after the function is called.
      */
+#if __cplusplus > 201703L
+    void setTimeout( auto _function, int _delay ) {
+#else
     template<typename Function>
     void setTimeout( Function _function, int _delay ) {
+#endif
 
       this->m_clear = false;
       std::thread t( [ = ]() {
@@ -76,8 +80,12 @@ namespace vx {
      * @param _function   Call back function.
      * @param _interval   Interval in milliseconds after the function is called.
      */
+#if __cplusplus > 201703L
+    void setInterval( auto _function, int _interval ) {
+#else
     template<typename Function>
     void setInterval( Function _function, int _interval ) {
+#endif
 
       this->m_clear = false;
       std::thread t( [ = ]() {