github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

cpp: Fixed issue with confict of flat include and visited headers #1090

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8487 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-29 14:03:38 +00:00
parent 4a85cc047d
commit 10f23f5866
4 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CppBase/CppBase.h
View file

@ -102,7 +102,7 @@ bool IncludesFile(const String& parent_path, const String& header_path);
struct FlatPP {
Index<int> segment_id;
Index<String> usings;
Index<String> includes;
// Index<String> includes;
};
const FlatPP& GetFlatPPFile(const char *path); // with #includes resolved

2
uppsrc/CppBase/cpp.cpp
View file

@ -166,8 +166,6 @@ void Cpp::DoFlatInclude(const String& header_path)
namespace_using.FindAdd(pp.usings[i]);
usings << ";" << pp.usings[i];
}
for(int i = 0; i < pp.includes.GetCount(); i++)
visited.FindAdd(pp.includes[i]);
}
}

3
uppsrc/CppBase/ppfile.cpp
View file

@ -430,9 +430,6 @@ const FlatPP& GetFlatPPFile(const char *path, Index<String>& visited)
fp.segment_id.Add(pp.segment_id[i]);
for(int i = 0; i < pp.usings.GetCount(); i++)
fp.usings.Add(pp.usings[i]);
fp.includes.FindAdd(s);
for(int i = 0; i < pp.includes.GetCount(); i++)
fp.includes.FindAdd(pp.includes[i]);
}
}
else

1
uppsrc/ide/Build.cpp
View file

@ -159,7 +159,6 @@ void Ide::PreprocessInternal()
{
if(editor.GetLength() >= 1000000) // Sanity...
return;
LOG("===== Preprocess internal");
int l = editor.GetCurrentLine();
PPSync(GetIncludePath());
String pfn = ConfigFile(GetFileTitle(editfile) + ".i.tmp");