Switch to standard integer types in courgette/.

courgette/ensemble.h

 // Copyright (c) 2011 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.
 
 // The main idea in Courgette is to do patching *under a tranformation*.  The
 // input is transformed into a new representation, patching occurs in the new
 // repesentation, and then the tranform is reversed to get the patched data.
 //
 // The idea is applied to pieces (or 'Elements') of the whole (or 'Ensemble').
 // Each of the elements has to go through the same set of steps in lock-step,
 // but there may be many different kinds of elements, which have different
 // transformation.
 //
 // This file declares all the main types involved in creating and applying a
 // patch with this structure.
 
 #ifndef COURGETTE_ENSEMBLE_H_
 #define COURGETTE_ENSEMBLE_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include <string>
 #include <vector>
-#include <string>
 
-#include "base/basictypes.h"
-
+#include "base/macros.h"
 #include "courgette/courgette.h"
 #include "courgette/region.h"
 #include "courgette/streams.h"
 
 namespace courgette {
 
 // Forward declarations:
 class Ensemble;
 
 // An Element is a region of an Ensemble with an identifyable kind.
@@ skipping 88 matching lines @@
   //        transformed-element-1
   //        transformed-element-2
   //        ...
   //    stream 3:
   //      correction:
   //        base-file
   //        element-1
   //        element-2
   //        ...
 
-  static const uint32 kMagic = 'C' | ('o' << 8) | ('u' << 16);
+  static const uint32_t kMagic = 'C' | ('o' << 8) | ('u' << 16);
 
-  static const uint32 kVersion = 20110216;
+  static const uint32_t kVersion = 20110216;
 };
 
 // For any transform you would implement both a TransformationPatcher and a
 // TransformationPatchGenerator.
 //
 // TransformationPatcher is the interface which abstracts out the actual
 // transformation used on an Element.  The patching itself happens outside the
 // actions of a TransformationPatcher.  There are four steps.
 //
 // The first step is an Init step.  The parameters to the Init step identify the
@@ skipping 93 matching lines @@
                         SinkStream* reformed_element);
 
  protected:
   Element* old_element_;
   Element* new_element_;
   TransformationPatcher* patcher_;
 };
 
 }  // namespace
 #endif  // COURGETTE_ENSEMBLE_H_