Merge pull request #37 from oblivioncth/dev

Merge to master for v0.2.0.2 hotfix
oblivioncth · Jan 2, 2023 · 6a59970 · 6a59970
2 parents 3d1a5fa + 76ea559
commit 6a59970
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ option(STARPP_DOCS "Build STAR++ documentation" OFF)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(STARpp
-    VERSION 0.2.0.1
+    VERSION 0.2.0.2
     LANGUAGES CXX
     DESCRIPTION "C++ implementation of STAR voting"
 )

diff --git a/app/src/resultspresenter.cpp b/app/src/resultspresenter.cpp
@@ -72,7 +72,7 @@ void ResultPresenter::printElectionResult(const Star::ElectionResult& result)
 
     // Print raw score rankings
     cout << HEADING_SCORE_RANKINGS << endl;
-    for(const Rank& rank : result.election()->scoreRankings())
+    for(const Star::Rank& rank : result.election()->scoreRankings())
         cout << RAW_SCORE_TEMPLATE.arg(Qx::String::join(rank.candidates, R"(", ")")).arg(rank.value) << endl;
     cout << endl;
 

diff --git a/lib/include/star/rank.h b/lib/include/star/rank.h
@@ -4,6 +4,9 @@
 // Qt Includes
 #include <QSet>
 
+namespace Star
+{
+
 struct Rank
 {
     enum Order { Ascending, Descending };
@@ -14,4 +17,6 @@ struct Rank
     static QList<Rank> rankSort(const QMap<QString, int>& valueMap, Order order = Descending);
 };
 
+}
+
 #endif // RANK_H
diff --git a/lib/src/rank.cpp b/lib/src/rank.cpp
@@ -4,6 +4,9 @@
 // Qt Includes
 #include <QMultiMap>
 
+namespace Star
+{
+
 //===============================================================================================================
 // Rank
 //===============================================================================================================
@@ -105,3 +108,5 @@ QList<Rank> Rank::rankSort(const QMap<QString, int>& valueMap, Order order)
 
     return rankings;
 }
+
+}