Fix missing typenames with gcc + fix QOlm_Example target name (it was…

… QOlm_QOlmExample)
OlivierLDff · Apr 26, 2020 · 26a313d · 26a313d
1 parent c270aec
commit 26a313d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -121,7 +121,7 @@ else()
 endif()
 
 target_include_directories(${QOLM_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
-target_compile_features(${QOLM_TARGET} PUBLIC cxx_std_11)
+target_compile_features(${QOLM_TARGET} PUBLIC cxx_std_17)
 target_link_libraries(${QOLM_TARGET} PUBLIC eventpp Qt5::Core Qt5::Qml)
 
 set_target_properties(${QOLM_TARGET} PROPERTIES FOLDER ${QOLM_FOLDER_PREFIX})

diff --git a/docs/build.md b/docs/build.md
@@ -74,8 +74,8 @@ The option `QOLM_ENABLE_EXAMPLES` should be turned on.
 
 ```bash
 cmake -DQOLM_ENABLE_EXAMPLES=ON ..
-cmake --build . --target QOlm_Examples --config "Release"
-./examples/QOlm_Examples
+cmake --build . --target QOlm_Example --config "Release"
+./examples/QOlm_Example
 ```
 
 ## 🚩 Additional CMake flags

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -14,4 +14,4 @@ macro(objlist_example_add EXAMPLE_NAME)
 endmacro()
 
 set(QOLM_EXAMPLES_FOLDER ${CMAKE_CURRENT_SOURCE_DIR})
-objlist_example_add(QOlmExample)
+objlist_example_add(Example)
diff --git a/examples/QOlmExample.cpp → examples/Example.cpp b/examples/QOlmExample.cpp → examples/Example.cpp
diff --git a/include/QOlm/QOlm.hpp b/include/QOlm/QOlm.hpp
@@ -560,19 +560,19 @@ class QOlm : public QOlmBase
         std::function<void(const InsertedCallbackArgs&)> callback)
     {
         return callback ? _callbacks.inserted.append(callback) :
-                          InsertedCallbackList::Handle();
+                          typename InsertedCallbackList::Handle();
     }
     typename RemovedCallbackList::Handle onRemoved(
         std::function<void(const RemovedCallbackArgs&)> callback)
     {
         return callback ? _callbacks.removed.append(callback) :
-                          RemovedCallbackList::Handle();
+                          typename RemovedCallbackList::Handle();
     }
     typename MovedCallbackList::Handle onMoved(
         std::function<void(const MovedCallbackArgs&)> callback)
     {
         return callback ? _callbacks.moved.append(callback) :
-                          MovedCallbackList::Handle();
+                          typename MovedCallbackList::Handle();
     }
 
     void stopListenInsert(typename InsertedCallbackList::Handle h)