Vendor import of clang trunk r126547:

http://llvm.org/svn/llvm-project/cfe/trunk@126547

1 files changed, 1 insertions, 3 deletions

diff --git a/include/clang/Frontend/HeaderSearchOptions.h b/include/clang/Frontend/HeaderSearchOptions.h
index cbb4a57..b0669eb 100644
--- a/include/clang/Frontend/HeaderSearchOptions.h
+++ b/include/clang/Frontend/HeaderSearchOptions.h
@@ -22,6 +22,7 @@ namespace frontend {
     Quoted = 0,     ///< `#include ""` paths. Thing `gcc -iquote`.
     Angled,         ///< Paths for both `#include ""` and `#include <>`. (`-I`)
     System,         ///< Like Angled, but marks system directories.
+    CXXSystem,      ///< Like System, but only used for C++.
     After           ///< Like System, but searched after the system directories.
   };
 }
@@ -54,9 +55,6 @@ public:
   /// User specified include entries.
   std::vector<Entry> UserEntries;
 
-  /// If non-empty, the list of C++ standard include paths to use.
-  std::vector<std::string> CXXSystemIncludes;
-
   /// A (system-path) delimited list of include paths to be added from the
   /// environment following the user specified includes (but prior to builtin
   /// and standard includes). This is parsed in the same manner as the CPATH