Switch to C++20

Author: kleag

SetCompilerFlags.cmake

@@ -29,9 +29,6 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     # set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-z,defs,--no-as-needed")
     string(APPEND CMAKE_SHARED_LINKER_FLAGS " -Wl,-z,defs,--no-as-needed,--no-undefined")
     include(CheckCXXCompilerFlag)
-    CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STDCPP0X)
-    CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STDCPP11)
-    CHECK_CXX_COMPILER_FLAG(-std=c++14 HAVE_STDCPP14)
     CHECK_CXX_COMPILER_FLAG(-std=c++17 HAVE_STDCPP17)
     CHECK_CXX_COMPILER_FLAG(-std=c++20 HAVE_STDCPP20)
 
@@ -46,16 +43,16 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
       set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer")
     endif()
 
-    if (HAVE_STDCPP17)
-      message("C++17 supported ")
-      set(CMAKE_CXX_STANDARD 17)
-      set(CMAKE_CXX_STANDARD_REQUIRED ON)
-      set(CMAKE_CXX_EXTENSIONS OFF)
-    # if (HAVE_STDCPP20)
-    #   message("C++20 supported ")
-    #   set(CMAKE_CXX_STANDARD 20)
+    # if (HAVE_STDCPP17)
+    #   message("C++17 supported ")
+    #   set(CMAKE_CXX_STANDARD 17)
     #   set(CMAKE_CXX_STANDARD_REQUIRED ON)
-    #   set(CMAKE_CXX_EXTENSIONS ON)
+    #   set(CMAKE_CXX_EXTENSIONS OFF)
+    if (HAVE_STDCPP20)
+      message("C++20 supported ")
+      set(CMAKE_CXX_STANDARD 20)
+      set(CMAKE_CXX_STANDARD_REQUIRED ON)
+      set(CMAKE_CXX_EXTENSIONS ON)
     else ()
       message(FATAL_ERROR "Minimum C++ version NOT supported")
     endif ()
@@ -138,9 +135,6 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 #    set(CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-as-needed")
 
     include(CheckCXXCompilerFlag)
-    CHECK_CXX_COMPILER_FLAG(-std=c++0x HAVE_STDCPP0X)
-    CHECK_CXX_COMPILER_FLAG(-std=c++11 HAVE_STDCPP11)
-    CHECK_CXX_COMPILER_FLAG(-std=c++14 HAVE_STDCPP14)
     CHECK_CXX_COMPILER_FLAG(-std=c++17 HAVE_STDCPP17)
     CHECK_CXX_COMPILER_FLAG(-std=c++20 HAVE_STDCPP20)
     CHECK_CXX_COMPILER_FLAG(-fno-omit-frame-pointer HAVE_NO_OMIT_FRAME_POINTER)

deeplima/libs/static_graph/dict_base.h

@@ -25,7 +25,7 @@ template <class D=std::shared_ptr<DictBase>>
 class DictsHolderImpl : public std::vector<D>
 {
 public:
-  virtual ~DictsHolderImpl<D>() = default;
+  virtual ~DictsHolderImpl() = default;
   std::vector<uint32_t> get_counters() const
   {
     std::vector<uint32_t> v(this->size());

lima_common/src/common/FsaAccess/FsaAccessBuilderRandom16.cpp

@@ -347,12 +347,6 @@ bool FsaAccessBuilderRandom16::scanAndCloneConfluentStates(
       graphType::degree_size_type ind = boost::in_degree(to, m_graph);
       if( ind > 1 ) {
         // c'est un etat confluent: suppressEdge( from, to, currentChar );
-#ifdef DEBUG_CD
-        std::ostringstream oss;
-        oss << "FsaAccessBuilderRandom16::scanAndCloneConfluentStates: supressEdge("
-               << edge << "," << currentChar << ")";
-        LDEBUG <<  oss.str().c_str();
-#endif
         // remove element from vector counts
         // tableau des coefficients
         graphType::degree_size_type outd0 = boost::out_degree(from, m_graph);

lima_linguisticprocessing/src/linguisticProcessing/core/Compounds/CompoundsBuilderFromSyntacticData.cpp

@@ -199,22 +199,22 @@ void CompoundsBuilderFromSyntacticDataPrivate::initMacros2ConceptsMapping(
     {
       LinguisticCode macro = macroManager.getPropertyValue((*it).first);
       std::string typeName = (*it).second;
-      Lima::Common::MediaticData::ConceptType concept = (*(m_conceptTypes.find("LatticeDown"))).second;
+      Lima::Common::MediaticData::ConceptType semanticConcept = (*(m_conceptTypes.find("LatticeDown"))).second;
       if (m_conceptTypes.find(typeName) == m_conceptTypes.end())
       {
         MDATALOGINIT;
         LERROR << "Concept type name " << typeName.c_str() << " not found. Keeping LatticeDown (should be '0').";
       }
       else
       {
-        concept = (*(m_conceptTypes.find(typeName))).second;
+                semanticConcept = (*(m_conceptTypes.find(typeName))).second;
       }
 
 #ifdef DEBUG_LP
       LDEBUG << "    " << (*it).first << " (" << macro << ") <-> "
-          << (*it).second << " (" << concept << ")";
+          << (*it).second << " (" << semanticConcept << ")";
 #endif
-      m_macro2ConceptMapping.insert(std::make_pair(macro,concept));
+      m_macro2ConceptMapping.insert(std::make_pair(macro, semanticConcept));
     }
 
   }

lima_linguisticprocessing/tools/automatonCompiler/libautomatonCompiler/recognizerCompiler.cpp

@@ -450,7 +450,7 @@ readSubAutomaton(const LimaString& line,
   if (bracket==-1) {
     ostringstream oss;
     oss << "definition of sub-automaton must have opening character "
-        <<CHAR_SUBAUTOMATON_BEGIN.unicode()<<" on first line";
+        << int(CHAR_SUBAUTOMATON_BEGIN.unicode()) << " on first line";
     throwError(oss.str(),line);
   }
   sub.setAutomatonName(line.left(bracket).trimmed());

lima_linguisticprocessing/tools/common/readBoWFile.cpp

@@ -273,6 +273,12 @@ void readSDocuments(ifstream& fileIn, BoWDocument* document, BoWBinaryReader& re
       cout << writer << endl;
       break;
     }
+    default:
+    {
+      std::string err_msg = "Unsupported BoWBlocType.";
+      std::cerr << "Error: " << err_msg << std::endl;
+      throw LimaException(err_msg);
+    }
   }
   if (bt!=BagOfWords::BoWBlocType::END_BLOC)
   {