Minor changes

pvigier · Nov 1, 2018 · 080153a · 080153a
1 parent 71e9348
commit 080153a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,4 +65,5 @@ lib
 *.geany
 
 # Vim
-compile_commands.json
+compile_commands.json
+*.swp
diff --git a/media/articles/new_city.xml b/media/articles/new_city.xml
@@ -7,7 +7,7 @@ His first mission will be to connect {{ city }} with the rest of the world using
 
 Then, he must order the construction of housing, industries and shops to attract people and populate the city.
 
-The final objective of the government with {{ city }} is to find the best model of city to make the citizens as happy as possible.
+The final objective of the government with {{ city }} is to find the best city model to make the citizens happy. If the project is successful, the developed model will be applied in cities across the country.
 
 We wish good luck to our new mayor.
     </body>

diff --git a/src/util/Trie.h b/src/util/Trie.h
@@ -61,7 +61,7 @@ class Trie
     // Prefix
 
     template <typename String>
-    std::basic_string<Char> getLongestPrefix(String&& string)
+    std::basic_string<Char> getLongestPrefix(String&& string) const
     {
         std::basic_string<Char> prefix;
         Node* node = mRoot.get();

diff --git a/src/util/enum.h b/src/util/enum.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#include <type_traits>
+
 template<typename E>
 struct EnableBitMaskOperators
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,4 +65,5 @@ lib @@
     *.geany
     # Vim
-    compile_commands.json
+    compile_commands.json
+    *.swp