Merge 76320 - Implementation of an STL compatible allocator for Courgette on ...

courgette/streams.h

 // Copyright (c) 2009 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.
 
 // Streams classes.
 //
 // These memory-resident streams are used for serialzing data into a sequential
 // region of memory.
 // Streams are divided into SourceStreams for reading and SinkStreams for
 // writing.  Streams are aggregated into Sets which allows several streams to be
 // used at once.  Example: we can write A1, B1, A2, B2 but achive the memory
 // layout A1 A2 B1 B2 by writing 'A's to one stream and 'B's to another.
 #ifndef COURGETTE_STREAMS_H_
 #define COURGETTE_STREAMS_H_
 
 #include <stdio.h>  // for FILE*
 #include <string>
 
 #include "base/basictypes.h"
 
+#include "courgette/memory_allocator.h"
 #include "courgette/region.h"
 
 namespace courgette {
 
 class SourceStream;
 class SinkStream;
 
 // Maximum number of streams in a stream set.
 static const unsigned int kMaxStreams = 10;
 
@@ skipping 113 matching lines @@
     return reinterpret_cast<const uint8*>(buffer_.c_str());
   }
 
   // Hints that the stream will grow by an additional |length| bytes.
   void Reserve(size_t length) { buffer_.reserve(length + buffer_.length()); }
 
   // Finished with this stream and any storage it has.
   void Retire();
 
  private:
-  std::string buffer_;  // Use a string to manage the stream's memory.
+  // Use a string to manage the stream's memory.
+  typedef std::basic_string<char,
+                            std::char_traits<char>,
+                            MemoryAllocator<char> > SinkBuffer;
+  SinkBuffer buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(SinkStream);
 };
 
 // A SourceStreamSet is a set of SourceStreams.
 class SourceStreamSet {
  public:
   SourceStreamSet();
   ~SourceStreamSet();
 
@@ skipping 56 matching lines @@
   void CopyHeaderTo(SinkStream* stream);
 
   size_t count_;
   SinkStream streams_[kMaxStreams];
 
   DISALLOW_COPY_AND_ASSIGN(SinkStreamSet);
 };
 
 }  // namespace
 #endif  // COURGETTE_STREAMS_H_