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

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8448 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-14 13:56:34 +00:00
parent b0a927e26f
commit 4ae42c23b6
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
uppsrc/CppBase/cpp.cpp
View file

@ -383,7 +383,8 @@ String Cpp::GetIncludedMacroValues(const Vector<String>& m)
if(mm.GetCount())
r << '#' << m[i] << '\n' << mm << '\n';
}
return MD5String(r);
return r;
// return MD5String(r);
}
END_UPP_NAMESPACE

1
uppsrc/CppBase/ppfile.cpp
View file

@ -262,6 +262,7 @@ void PPFile::Parse(Stream& in)
next_segment = true;
m.type = type;
m.text = id;
DLOG("namespace " << id);
}
was_namespace = was_using = false;
}

10
uppsrc/ide/Browser/Base.cpp
View file

@ -199,8 +199,10 @@ bool CheckFile(const SourceFileInfo& f, const String& path)
RTIMING("CheckFile");
LDUMP(f.time);
LDUMP(FileGetTime(path));
if(f.time != FileGetTime(path))
if(f.time != FileGetTime(path)) {
DLOG("Wrong time: " << path);
return false;
}
if(!f.check_info)
return true;
Cpp pp;
@ -209,6 +211,11 @@ bool CheckFile(const SourceFileInfo& f, const String& path)
String included_id_macros = pp.GetIncludedMacroValues(f.ids.GetKeys());
LDUMP(included_id_macros);
LDUMP(f.included_id_macros);
if(f.included_id_macros != included_id_macros) {
DLOG("Other reason: " << path);
DDUMP(f.included_id_macros);
DDUMP(included_id_macros);
}
return f.included_id_macros == included_id_macros;
}
@ -427,6 +434,7 @@ void SyncCodeBase()
{
LTIMING("SyncCodeBase");
LTIMESTOP("SyncCodeBase");
DLOG("============= Sync code base");
Progress pi;
pi.Title("Parsing source files");
UpdateCodeBase(pi);