From 4ae42c23b69baffcd9d8f5a0dcd863e910831773 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Thu, 14 May 2015 13:56:34 +0000
Subject: [PATCH] .cpp

git-svn-id: svn://ultimatepp.org/upp/trunk@8448 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CppBase/cpp.cpp      |  3 ++-
 uppsrc/CppBase/ppfile.cpp   |  1 +
 uppsrc/ide/Browser/Base.cpp | 10 +++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CppBase/cpp.cpp b/uppsrc/CppBase/cpp.cpp
index 9b95793cd..50b50853c 100644
--- a/uppsrc/CppBase/cpp.cpp
+++ b/uppsrc/CppBase/cpp.cpp
@@ -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
diff --git a/uppsrc/CppBase/ppfile.cpp b/uppsrc/CppBase/ppfile.cpp
index 6f8a418d0..444caa7a5 100644
--- a/uppsrc/CppBase/ppfile.cpp
+++ b/uppsrc/CppBase/ppfile.cpp
@@ -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;
 					}
diff --git a/uppsrc/ide/Browser/Base.cpp b/uppsrc/ide/Browser/Base.cpp
index f724970ac..f095ef401 100644
--- a/uppsrc/ide/Browser/Base.cpp
+++ b/uppsrc/ide/Browser/Base.cpp
@@ -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);