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

google_breakpad/processor/code_module.h

 // Copyright (c) 2006, 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 18 matching lines @@
 
 // code_module.h: Carries information about code modules that are loaded
 // into a process.
 //
 // Author: Mark Mentovai
 
 #ifndef GOOGLE_BREAKPAD_PROCESSOR_CODE_MODULE_H__
 #define GOOGLE_BREAKPAD_PROCESSOR_CODE_MODULE_H__
 
 #include <string>
+
+#include "common/using_std_string.h"
 #include "google_breakpad/common/breakpad_types.h"
 
 namespace google_breakpad {
 
 using std::string;

[Mark Mentovai, 2012/06/20 22:07:19]

Get rid of this now.

[ivanpe.google, 2012/06/22 23:41:57]

Good catch

 
 class CodeModule {
  public:
   virtual ~CodeModule() {}
 
   // The base address of this code module as it was loaded by the process.
   // (u_int64_t)-1 on error.
   virtual u_int64_t base_address() const = 0;
 
   // The size of the code module.  0 on error.
@@ skipping 31 matching lines @@
   // Creates a new copy of this CodeModule object, which the caller takes
   // ownership of.  The new CodeModule may be of a different concrete class
   // than the CodeModule being copied, but will behave identically to the
   // copied CodeModule as far as the CodeModule interface is concerned.
   virtual const CodeModule* Copy() const = 0;
 };
 
 }  // namespace google_breakpad
 
 #endif  // GOOGLE_BREAKPAD_PROCESSOR_CODE_MODULE_H__