From ce57e45e5fa32c963cfa0349caaef13274bf9bbb Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 9 Jan 2012 09:28:52 +0000 Subject: [PATCH] .benchmarks: sizeof git-svn-id: svn://ultimatepp.org/upp/trunk@4373 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- benchmarks/sizeof/init | 1 + benchmarks/sizeof/main.cpp | 13 +++++++++++-- benchmarks/sizeof/sizeof.upp | 21 +++++++++++---------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/benchmarks/sizeof/init b/benchmarks/sizeof/init index 970c8aeb4..f43f5bd0e 100644 --- a/benchmarks/sizeof/init +++ b/benchmarks/sizeof/init @@ -1,4 +1,5 @@ #ifndef _sizeof_icpp_init_stub #define _sizeof_icpp_init_stub #include "Core/init" +#include "CtrlLib/init" #endif diff --git a/benchmarks/sizeof/main.cpp b/benchmarks/sizeof/main.cpp index c7900c53e..d0d1548a1 100644 --- a/benchmarks/sizeof/main.cpp +++ b/benchmarks/sizeof/main.cpp @@ -1,8 +1,8 @@ -#include +#include using namespace Upp; -CONSOLE_APP_MAIN +GUI_APP_MAIN { RDUMP(sizeof(bool)); RDUMP(sizeof(int)); @@ -36,6 +36,15 @@ CONSOLE_APP_MAIN RDUMP(sizeof(Point)); RDUMP(sizeof(Rect)); RDUMP(sizeof(Color)); + RDUMP(sizeof(Complex)); + RDUMP(sizeof(Uuid)); + RDUMP(sizeof(ValueArray)); + RDUMP(sizeof(ValueMap)); RDUMP(sizeof(Mutex)); RDUMP(sizeof(RWMutex)); + RDUMP(sizeof(Image)); + RDUMP(sizeof(Font)); + RDUMP(sizeof(AttrText)); + RDUMP(sizeof(Painting)); + RDUMP(sizeof(Drawing)); } diff --git a/benchmarks/sizeof/sizeof.upp b/benchmarks/sizeof/sizeof.upp index df2550ddd..3559d219a 100644 --- a/benchmarks/sizeof/sizeof.upp +++ b/benchmarks/sizeof/sizeof.upp @@ -1,10 +1,11 @@ -uses - Core; - -file - main.cpp - depends() test.h; - -mainconfig - "" = "CONSOLE MT"; - +uses + Core, + CtrlLib; + +file + main.cpp + depends() test.h; + +mainconfig + "" = "GUI MT"; +