diff options
-rw-r--r-- | third_party/cld/base/commandlineflags.h | 2 | ||||
-rw-r--r-- | third_party/cld/base/logging.h | 2 | ||||
-rw-r--r-- | third_party/cld/base/stl_decl.h | 24 | ||||
-rw-r--r-- | third_party/cld/cld.gyp | 1 |
4 files changed, 2 insertions, 27 deletions
diff --git a/third_party/cld/base/commandlineflags.h b/third_party/cld/base/commandlineflags.h index fd25767..90598a7 100644 --- a/third_party/cld/base/commandlineflags.h +++ b/third_party/cld/base/commandlineflags.h @@ -27,7 +27,7 @@ #include <vector> #include "base/basictypes.h" #include "base/port.h" -#include "third_party/cld/base/stl_decl.h" +#include "third_party/cld/base/stl_decl_msvc.h" #include "third_party/cld/base/global_strip_options.h" // -------------------------------------------------------------------- diff --git a/third_party/cld/base/logging.h b/third_party/cld/base/logging.h index 2f75397..52c0eb4 100644 --- a/third_party/cld/base/logging.h +++ b/third_party/cld/base/logging.h @@ -23,7 +23,7 @@ #include "third_party/cld/base/dynamic_annotations.h" #include "third_party/cld/base/macros.h" #include "third_party/cld/base/scoped_ptr.h" -#include "third_party/cld/base/stl_decl.h" +#include "third_party/cld/base/stl_decl_msvc.h" #include "third_party/cld/base/log_severity.h" #include "third_party/cld/base/vlog_is_on.h" #include "third_party/cld/base/global_strip_options.h" diff --git a/third_party/cld/base/stl_decl.h b/third_party/cld/base/stl_decl.h index 25671e7..e69de29 100644 --- a/third_party/cld/base/stl_decl.h +++ b/third_party/cld/base/stl_decl.h @@ -1,24 +0,0 @@ -// Copyright (c) 2006-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. - -// In most .h files, we would rather include a declaration of an stl -// rather than including the appropriate stl h file (which brings in -// lots of crap). For many STL classes this is ok (eg pair), but for -// some it's really annoying. We define those here, so you can -// just include this file instead of having to deal with the annoyance. -// -// Most of the annoyance, btw, has to do with the default allocator. -// -// DEPRECATED: this file is deprecated. Do not use in new code. -// Be careful about removing from old code, though, because your -// header file might be included by higher-level code that is -// accidentally depending on this. -// -- mec 2007-01-17 - -#ifndef BASE_STL_DECL_H_ -#define BASE_STL_DECL_H_ - -#include "third_party/cld/base/stl_decl_msvc.h" - -#endif // BASE_STL_DECL_H_ diff --git a/third_party/cld/cld.gyp b/third_party/cld/cld.gyp index e63bd12..9f47d76 100644 --- a/third_party/cld/cld.gyp +++ b/third_party/cld/cld.gyp @@ -78,7 +78,6 @@ 'bar/toolbar/cld/i18n/languages/public/languages.h', 'base/casts.h', 'base/commandlineflags.h', - 'base/stl_decl.h', 'base/global_strip_options.h', 'base/logging.h', 'base/macros.h', |