diff --git a/fastlib/branches/fastlib-stl/fastlib/col/col_test.cc b/fastlib/branches/fastlib-stl/fastlib/col/col_test.cc index fc85ca373f..769c36e43a 100644 --- a/fastlib/branches/fastlib-stl/fastlib/col/col_test.cc +++ b/fastlib/branches/fastlib-stl/fastlib/col/col_test.cc @@ -291,7 +291,6 @@ void TestIntMap() { void TestRangeSet() { RangeSet set; - set.Init(); set.Union(1, 4); set.Union(10, 16); set.Union(4, 10); diff --git a/fastlib/branches/fastlib-stl/fastlib/col/rangeset.h b/fastlib/branches/fastlib-stl/fastlib/col/rangeset.h index bbe7fdceb6..7a5e5d2c67 100644 --- a/fastlib/branches/fastlib-stl/fastlib/col/rangeset.h +++ b/fastlib/branches/fastlib-stl/fastlib/col/rangeset.h @@ -39,9 +39,10 @@ #define COL_RANGESET_H #include "../base/base.h" -#include + #include #include +#include /** * A set containing a union of [start,end) ranges that are automatically @@ -74,12 +75,6 @@ class RangeSet { ranges_.reserve(size); } - /** - * Deprecated, use constructor. - */ - void Init() { - } - /** * Reinitializes to an empty set of ranges. */ diff --git a/fastlib/branches/fastlib-stl/fastlib/col/tokenizer.h b/fastlib/branches/fastlib-stl/fastlib/col/tokenizer.h index e7a44db3fd..309b297b29 100644 --- a/fastlib/branches/fastlib-stl/fastlib/col/tokenizer.h +++ b/fastlib/branches/fastlib-stl/fastlib/col/tokenizer.h @@ -42,7 +42,6 @@ #include "../base/base.h" #include -#include #include #include diff --git a/fastlib/branches/fastlib-stl/fastlib/thor/distribcache.cc b/fastlib/branches/fastlib-stl/fastlib/thor/distribcache.cc index 47648c6b68..3af51ece00 100644 --- a/fastlib/branches/fastlib-stl/fastlib/thor/distribcache.cc +++ b/fastlib/branches/fastlib-stl/fastlib/thor/distribcache.cc @@ -102,8 +102,6 @@ void DistributedCache::InitCommon_(int channel_num_in) { overflow_next_.default_value() = BIG_BAD_NUMBER; overflow_device_ = NULL; - write_ranges_.Init(); - my_rank_ = rpc::rank(); }