From 8edeaac6b4a9b1b7723ac223deadc50a0530b7df Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 17 May 2015 17:42:35 +0000 Subject: [PATCH] .cpp: IGNORE_ELSE solving push_back problem #1079 git-svn-id: svn://ultimatepp.org/upp/trunk@8458 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CppBase/CppBase.h | 2 -- uppsrc/CppBase/cpp.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/CppBase/CppBase.h b/uppsrc/CppBase/CppBase.h index c76803a7c..a17542cfe 100644 --- a/uppsrc/CppBase/CppBase.h +++ b/uppsrc/CppBase/CppBase.h @@ -415,8 +415,6 @@ struct CppItem { String CppItemKindAsString(int kind); int FindItem(const Array& x, const String& qitem); -//int GetCount(const Array& x, int i); -//int FindNext(const Array& x, int i); int FindName(const Array& x, const String& name, int i = 0); struct CppBase : ArrayMap > { diff --git a/uppsrc/CppBase/cpp.cpp b/uppsrc/CppBase/cpp.cpp index 52f898832..0f3892609 100644 --- a/uppsrc/CppBase/cpp.cpp +++ b/uppsrc/CppBase/cpp.cpp @@ -171,6 +171,8 @@ void Cpp::DoFlatInclude(const String& header_path) } } +#define IGNORE_ELSE + void Cpp::Do(const String& sourcefile, Stream& in, const String& currentfile, bool get_macros) { if(visited.Find(currentfile) >= 0 || visited.GetCount() > 20000)