Browse Source

[2155] checkCountersAllZeroExcept() returns void

Conflicts:
	src/bin/auth/tests/statistics_unittest.cc.pre
Yoshitaka Aharen 12 years ago
parent
commit
52598eb44e
1 changed files with 3 additions and 3 deletions
  1. 3 3
      src/bin/auth/tests/statistics_unittest.cc.pre

+ 3 - 3
src/bin/auth/tests/statistics_unittest.cc.pre

@@ -76,7 +76,9 @@ flatten(std::map<std::string, int>& flat_map, const std::string& prefix,
     }
     }
 }
 }
 
 
-bool
+// Test if the values of the counters are all zero except for the items
+// specified in except_for.
+void
 checkCountersAllZeroExcept(const isc::data::ConstElementPtr counters,
 checkCountersAllZeroExcept(const isc::data::ConstElementPtr counters,
                            const std::set<std::string>& except_for) {
                            const std::set<std::string>& except_for) {
     std::map<std::string, int> stats_map;
     std::map<std::string, int> stats_map;
@@ -95,8 +97,6 @@ checkCountersAllZeroExcept(const isc::data::ConstElementPtr counters,
             << i->first << " = " << expect << ", actual: "
             << i->first << " = " << expect << ", actual: "
             << i->second;
             << i->second;
     }
     }
-
-    return false;
 }
 }
 
 
 TEST_F(CountersTest, incrementNormalQuery) {
 TEST_F(CountersTest, incrementNormalQuery) {