From e45d9cc3e8022e8b6ec0dc192c089058333d4c9e Mon Sep 17 00:00:00 2001 From: cxl Date: Sat, 31 Jan 2015 12:39:40 +0000 Subject: [PATCH] .cosmetics git-svn-id: svn://ultimatepp.org/upp/trunk@8109 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/Core.upp | 2 +- uppsrc/Core/lheap.cpp | 2 +- uppsrc/ide/ide.upp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/Core/Core.upp b/uppsrc/Core/Core.upp index b5c6633c4..ca1c5b94d 100644 --- a/uppsrc/Core/Core.upp +++ b/uppsrc/Core/Core.upp @@ -32,7 +32,7 @@ link(SOLARIS) "-Wl,-R -Wl,/usr/local/lib"; link(GCC POSIX STACKTRACE) -rdynamic; file - Core.h options PCH, + Core.h options(BUILDER_OPTION) PCH, config.h, Defs.h, Cpu.cpp optimize_speed, diff --git a/uppsrc/Core/lheap.cpp b/uppsrc/Core/lheap.cpp index f99806cae..f650a4d21 100644 --- a/uppsrc/Core/lheap.cpp +++ b/uppsrc/Core/lheap.cpp @@ -270,7 +270,7 @@ bool Heap::LTryRealloc(void *ptr, size_t newsize) LLOG("--- TryRealloc " << asString(bh->size)); Header *n = bh->Next(); if(n->free && newsize <= (size_t)n->size + (size_t)bh->size) { - DivideBlock(n->GetBlock(), newsize - n->size); + DivideBlock(n->GetBlock(), int(newsize - n->size)); bh->size += n->size + sizeof(Header); n->Next()->prev = bh->size; return true; diff --git a/uppsrc/ide/ide.upp b/uppsrc/ide/ide.upp index 81f43f59e..a64f29e08 100644 --- a/uppsrc/ide/ide.upp +++ b/uppsrc/ide/ide.upp @@ -25,7 +25,7 @@ link(WIN32 MSC) /MAP; file IDE readonly separator, - ide.h options PCH, + ide.h options(BUILDER_OPTION) PCH, version.h, UppDlg.h, BaseDlg.cpp,