diff --git a/uppsrc/Core/AString.hpp b/uppsrc/Core/AString.hpp index 6f7eb37db..8161f78f0 100644 --- a/uppsrc/Core/AString.hpp +++ b/uppsrc/Core/AString.hpp @@ -201,10 +201,5 @@ inline int String0::Compare(const String0& s) const return 0; } #endif -/* int l1 = GetLength(); - int l2 = s.GetLength(); - int q = memcmp(Begin(), s.Begin(), min(l1, l2)); - int q = MemCmp_aligned__(Begin(), s.Begin(), min(l1, l2)); - return q ? q : l1 - l2;*/ return LCompare(s); } diff --git a/uppsrc/Core/Log.cpp b/uppsrc/Core/Log.cpp index c5fee5c7f..b6ec1bc4d 100644 --- a/uppsrc/Core/Log.cpp +++ b/uppsrc/Core/Log.cpp @@ -282,10 +282,10 @@ String AsString(MemoryProfile& mem) text << "Free pages " << mem.freepages << " (" << mem.freepages * 4 << " KB)\n"; text << "Large block count " << mem.large_count << ", total size " << (mem.large_total >> 10) << " KB\n"; - sLarge(text, mem.large_size, mem.large_count, "allocated"); +// sLarge(text, mem.large_size, mem.large_count, "allocated"); text << "Large fragments count " << mem.large_free_count << ", total size " << (mem.large_free_total >> 10) << " KB\n"; - sLarge(text, mem.large_free_size, mem.large_free_count, "fragments"); +// sLarge(text, mem.large_free_size, mem.large_free_count, "fragments"); return text; } diff --git a/uppsrc/Core/String.h b/uppsrc/Core/String.h index 693a475e9..13dca6570 100644 --- a/uppsrc/Core/String.h +++ b/uppsrc/Core/String.h @@ -4,7 +4,6 @@ class Nuller; #define FAST_STRING_COMPARE #endif - int wstrlen(const wchar *s); #ifdef PLATFORM_POSIX diff --git a/uppsrc/Draw/DrawOpX11.cpp b/uppsrc/Draw/DrawOpX11.cpp index 2d3a1c6f4..bd6f2b62b 100644 --- a/uppsrc/Draw/DrawOpX11.cpp +++ b/uppsrc/Draw/DrawOpX11.cpp @@ -116,6 +116,7 @@ Rect Draw::GetClipOp() const bool Draw::IsPaintingOp(const Rect& r) const { + LTIMING("IsPaintingOp"); Rect rr = r + actual_offset; const Vector& cl = clip[cloff.Top().clipi]; for(int i = 0; i < cl.GetCount(); i++) diff --git a/uppsrc/Draw/DrawTextXft.cpp b/uppsrc/Draw/DrawTextXft.cpp index 33d8584dc..ed42d5ac3 100644 --- a/uppsrc/Draw/DrawTextXft.cpp +++ b/uppsrc/Draw/DrawTextXft.cpp @@ -5,7 +5,7 @@ NAMESPACE_UPP #ifdef PLATFORM_XFT #define LLOG(x) //LOG(x) -#define LTIMING(x) //RTIMING(x) +#define LTIMING(x) RTIMING(x) struct XFTFontFaceInfo { String name; diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h index 01ab9b658..84ea96828 100644 --- a/uppsrc/ide/version.h +++ b/uppsrc/ide/version.h @@ -1 +1 @@ -#define IDE_VERSION "806.r123" +#define IDE_VERSION "806.r124" diff --git a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp index ba3c0f2ab..8b729fee1 100644 --- a/uppsrc/plugin/sqlite3/Sqlite3upp.cpp +++ b/uppsrc/plugin/sqlite3/Sqlite3upp.cpp @@ -268,7 +268,7 @@ void Sqlite3Session::Close() { if (NULL != db) { int retval; #ifndef flagNOAPPSQL - if(&SQL.GetSession() == this) + if(SQL.IsOpen() && &SQL.GetSession() == this) SQL.Cancel(); #endif retval = sqlite3_close(db);