Mechanical change to allow the co-existance of std::string with a global ::string class

processor/fast_source_line_resolver.cc

 // Copyright (c) 2010 Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 //
 // See fast_source_line_resolver.h and fast_source_line_resolver_types.h
 // for more documentation.
 //
 // Author: Siyang Xie (lambxsy@google.com)
 
 #include "google_breakpad/processor/fast_source_line_resolver.h"
 #include "processor/fast_source_line_resolver_types.h"
 
 #include <map>
+#include <string>
 #include <utility>
 
+#include "common/using_std_string.h"
 #include "processor/module_factory.h"
 #include "processor/scoped_ptr.h"
 
 using std::map;
 using std::make_pair;
 
 namespace google_breakpad {
 
 FastSourceLineResolver::FastSourceLineResolver()
   : SourceLineResolverBase(new FastModuleFactory) { }
@@ skipping 62 matching lines @@
       raw + 2 * sizeof(int32_t));
 
   u_int32_t prolog_size = para_uint32[0];;
   u_int32_t epilog_size = para_uint32[1];
   u_int32_t parameter_size = para_uint32[2];
   u_int32_t saved_register_size = para_uint32[3];
   u_int32_t local_size = para_uint32[4];
   u_int32_t max_stack_size = para_uint32[5];
   const char *boolean = reinterpret_cast<const char*>(para_uint32 + 6);
   bool allocates_base_pointer = (*boolean != 0);
-  std::string program_string = boolean + 1;
+  string program_string = boolean + 1;
 
   return WindowsFrameInfo(type,
                           prolog_size,
                           epilog_size,
                           parameter_size,
                           saved_register_size,
                           local_size,
                           max_stack_size,
                           allocates_base_pointer,
                           program_string);
@@ skipping 118 matching lines @@
   // Apply delta rules up to and including the frame's address.
   while (delta != cfi_delta_rules_.end() && delta.GetKey() <= address) {
     ParseCFIRuleSet(delta.GetValuePtr(), rules.get());
     delta++;
   }
 
   return rules.release();
 }
 
 }  // namespace google_breakpad