Clean up my TODO comments in SmallMap and Time.

base/containers/small_map.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef BASE_CONTAINERS_SMALL_MAP_H_
 #define BASE_CONTAINERS_SMALL_MAP_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 557 matching lines @@
     return map_.get();
   }
 
  private:
   int size_;  // negative = using hash_map
 
   MapInit functor_;
 
   // We want to call constructors and destructors manually, but we don't
   // want to allocate and deallocate the memory used for them separately.
-  // So, we use this crazy ManualConstructor class.
+  // So, we use this crazy ManualConstructor class. Since C++11 it's possible
+  // to use objects in unions like this, but the ManualDestructor syntax is
+  // a bit better and doesn't have limitations on object type.
   //
   // Since array_ and map_ are mutually exclusive, we'll put them in a
-  // union, too.  We add in a dummy_ value which quiets MSVC from otherwise
-  // giving an erroneous "union member has copy constructor" error message
-  // (C2621). This dummy member has to come before array_ to quiet the
-  // compiler.
-  //
-  // TODO(brettw) remove this and use C++11 unions when we require C++11.
+  // union.
   union {
-    ManualConstructor<value_type> dummy_;
     ManualConstructor<value_type> array_[kArraySize];
     ManualConstructor<NormalMap> map_;
   };
 
   void ConvertToRealMap() {
     // Move the current elements into a temporary array.
     ManualConstructor<value_type> temp_array[kArraySize];
 
     for (int i = 0; i < kArraySize; i++) {
       temp_array[i].InitFromMove(std::move(array_[i]));
@@ skipping 46 matching lines @@
           typename Functor>
 inline bool SmallMap<NormalMap, kArraySize, EqualKey,
                      Functor>::iterator::operator!=(
     const const_iterator& other) const {
   return other != *this;
 }
 
 }  // namespace base
 
 #endif  // BASE_CONTAINERS_SMALL_MAP_H_