Changeset 1418

Timestamp:

Oct 25, 2011, 3:00:49 AM (12 years ago)

Author:

Peter Johansson

Message:

avoid warnings (-Wall)

Location:

trunk

Files:

• lib/AddStats.cc (modified) (2 diffs)
• lib/BlameStats.cc (modified) (2 diffs)
• lib/ClassicStats.cc (modified) (1 diff)
• lib/FilePrinter.cc (modified) (1 diff)
• lib/Functor.h (modified) (1 diff)
• lib/Graph.cc (modified) (2 diffs)
• lib/TinyStats.cc (modified) (1 diff)
• lib/Vector.h (modified) (1 diff)
• test/parser.cc (modified) (1 diff)
• test/stats.cc (modified) (1 diff)
• test/vector.cc (modified) (2 diffs)

trunk/lib/AddStats.cc

@@ -72 +72 @@
         if (*rev_iter==svn_blame.revision()) {
           author = svn_blame.author();
-          assert(lt<add_vec.size());
+          assert(static_cast<size_t>(lt)<add_vec.size());
           ++add_vec[lt];
         }
@@ -93 +93 @@
         // add add_vec[lt] to current value
         vec.set(*rev_iter, vec[*rev_iter] + add_vec[lt]);
-        assert(data[lt][author][*rev_iter] >= add_vec[lt]);
+        assert(static_cast<size_t>(data[lt][author][*rev_iter])>=add_vec[lt]);
       }
     }

trunk/lib/BlameStats.cc

@@ -81 +81 @@
       while (svn_blame.valid()) {
         int lt = parser.parse(svn_blame.line());
-        assert(lt<data.size());
+        assert(static_cast<size_t>(lt)<data.size());
         SparseVector& vec = data[lt][svn_blame.author()];
         vec.set(*rev_iter, vec[*rev_iter] + 1);
@@ -96 +96 @@
     if (stats_.size()<data.size())
       stats_.resize(data.size());
-    for (int lt =0; lt<data.size(); ++lt) {
+    for (size_t lt =0; lt<data.size(); ++lt) {
       // just to avoid long long lines
       typedef std::map<std::string,SparseVector>::const_iterator const_iterator;

trunk/lib/ClassicStats.cc

@@ -68 +68 @@
     while (svn_blame.valid()) {
       LineTypeParser::line_type lt = parser.parse(svn_blame.line());
-      assert(lt<data.size());
+      assert(static_cast<size_t>(lt)<data.size());
       SparseVector& vec = data[lt][svn_blame.author()];
       vec.set(svn_blame.revision(), vec[svn_blame.revision()] + 1);

trunk/lib/FilePrinter.cc

@@ -119 +119 @@
     else {
       first = Graph::dates()[Graph::rev_min()];
-      assert(Graph::rev_max()<Graph::dates().size());
+      assert(static_cast<size_t>(Graph::rev_max()) < Graph::dates().size());
       last = Graph::dates()[Graph::rev_max()];
     }

trunk/lib/Functor.h

@@ -166 +166 @@
     {
       x += p.second;
+      return x;
     }
   };

trunk/lib/Graph.cc

@@ -93 +93 @@
 #ifdef HAVE_PLPLOT
     if (!plots_) {
-      assert(!date_xticks() || rev_min_<dates_.size());
+      assert(!date_xticks() || static_cast<size_t>(rev_min_)<dates_.size());
       assert(!date_xticks() || dates_[rev_min_]);
-      assert(rev_min_<dates_.size() || !date_xticks());
+      assert(static_cast<size_t>(rev_min_)<dates_.size() || !date_xticks());
       xmin_= date_xticks() ? dates_[rev_min_] : rev_min_;
-      assert(rev_max_<dates_.size() || !date_xticks());
+      assert(static_cast<size_t>(rev_max_)<dates_.size() || !date_xticks());
       xmax_= date_xticks() ? dates_[rev_max_] : rev_max_;
       xrange_=xmax_-xmin_;
@@ -202 +202 @@
     PLFLT x1 = rev1;
     if (date_xticks()) {
-      assert(rev0<dates_.size());
+      assert(static_cast<size_t>(rev0)<dates_.size());
       assert(dates_[rev0]);
       x0 = dates_[rev0];
-      assert(rev1<dates_.size());
+      assert(static_cast<size_t>(rev1)<dates_.size());
       assert(dates_[rev1]);
       x1 = dates_[rev1];

trunk/lib/TinyStats.cc

@@ -42 +42 @@
     if (j==i->second.end())
       return 0;
-    assert(lt < j->second.size());
+    assert(static_cast<size_t>(lt) < j->second.size());
     return j->second[lt];
   }

trunk/lib/Vector.h

@@ -181 +181 @@
       std::swap(map_, result.map_);
       resize(std::max(size_, other.size()));
+      return *this;
     }
 

trunk/test/parser.cc

@@ -35 +35 @@
 {
   theplu::svndigest::test::Suite suite(argc, argv);
-  bool ok=true;
   std::ofstream os("parser.tmp");
   test("parser.cc",os);

trunk/test/stats.cc

@@ -60 +60 @@
 {
   test::Suite suite(argc, argv, true);
-
-  bool verbose=suite.verbose();
 
   SVN* svn=SVN::instance("toy_project");

trunk/test/vector.cc

@@ -95 +95 @@
   expected[8]=1;
   expected[9]=13;
-  if (result.size() != expected.size()) {
+  if (static_cast<size_t>(result.size()) != expected.size()) {
     suite.add(false);
     suite.out() << "error: size: " << result.size() << " expected: " 
@@ -101 +101 @@
   }
   else {
-    for (size_t i=0; i<result.size(); ++i) {
+    for (svn_revnum_t i=0; i<result.size(); ++i) {
       if (result[i]!=expected[i]) {
         suite.add(false);