Merge branch 'refactor_networking' of https://github.com/supertuxkart/stk-code into refactor_networking

2015-11-26 08:48:05 +11:00
parent f81bd5d0c5 07876a0899
commit 517b0dabf9
1 changed files with 2 additions and 2 deletions
--- a/src/network/race_config.cpp
+++ b/src/network/race_config.cpp
@@ -29,10 +29,10 @@
 *  \return The key of type S that has the highest second value.
 */
 template<typename S>
-S getHighestInHistogram(std::map<S,int>* histogram, S default)
+S getHighestInHistogram(std::map<S,int>* histogram, S default_value)
 {
    if(histogram->empty())
-        return default;
+        return default_value;

    S best_item = histogram->begin()->first;
    uint8_t highest_count = histogram->begin()->second;