Author: kmachalkova Date: Tue Oct 23 15:16:34 2007 New Revision: 41525 URL: http://svn.opensuse.org/viewcvs/yast?rev=41525&view=rev Log: Merged GCC 4.3 related changes (missing includes, operator priority) from trunk into mod-ui branch Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCRichText.h Tue Oct 23 15:16:34 2007 @@ -142,7 +142,7 @@ if ( sline == unset || scol == unset || eline == unset || ecol == unset ) return false; - if ( eline == sline && ecol <= scol + if ( ( eline == sline && ecol <= scol ) || eline < sline ) return false; return true; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.cc Tue Oct 23 15:16:34 2007 @@ -20,6 +20,8 @@ #include "NCTablePad.h" #include "NCPopupMenu.h" +#include + #if 0 #undef DBG_CLASS #define DBG_CLASS "_NCTablePad_" Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTextPad.cc Tue Oct 23 15:16:34 2007 @@ -19,6 +19,8 @@ #include "Y2Log.h" #include "NCTextPad.h" +#include + /////////////////////////////////////////////////////////////////// // // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCstring.cc Tue Oct 23 15:16:34 2007 @@ -19,6 +19,7 @@ #include #include +#include #include "Y2Log.h" #include "NCstring.h" Modified: branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCstyle.h Tue Oct 23 15:16:34 2007 @@ -75,13 +75,13 @@ inline static chtype getChar ( chtype a ) { return a & char_mask; } inline static chtype getNonChar ( chtype a ) { return a & ~char_mask; } - inline static void setStyle ( chtype & a, chtype ch ) { a = a & ~style_mask | ch & style_mask; } - inline static void setColor ( chtype & a, chtype ch ) { if ( colors() ) a = a & ~color_mask | ch & color_mask; } - inline static void setChar ( chtype & a, chtype ch ) { a = a & ~char_mask | ch & char_mask; } + inline static void setStyle ( chtype & a, chtype ch ) { a = (a & ~style_mask) | (ch & style_mask); } + inline static void setColor ( chtype & a, chtype ch ) { if ( colors() ) a = (a & ~color_mask) | (ch & color_mask); } + inline static void setChar ( chtype & a, chtype ch ) { a = (a & ~char_mask) | (ch & char_mask); } - inline static void addStyle ( chtype & a, chtype ch ) { a = a | ch & style_mask; } + inline static void addStyle ( chtype & a, chtype ch ) { a = a | (ch & style_mask); } inline static void delStyle ( chtype & a, chtype ch ) { a = a & ~(ch & style_mask); } - inline static void toggleStyle( chtype & a, chtype ch ) { setStyle( a, a & ~ch | (a ^ ch) & ch ); } + inline static void toggleStyle( chtype & a, chtype ch ) { setStyle( a, (a & ~ch) | ((a ^ ch) & ch )); } inline static void addAlt ( chtype & a ) { a |= A_ALTCHARSET; } inline static void delAlt ( chtype & a ) { a &= ~A_ALTCHARSET; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCtext.cc Tue Oct 23 15:16:34 2007 @@ -21,6 +21,7 @@ #include "stringutil.h" #include // wcwidth +#include /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Tue Oct 23 15:16:34 2007 @@ -21,6 +21,7 @@ #include <string> #include #include +#include #include "Y2Log.h" #include Modified: branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/testsuite/NCstring_test.cc Tue Oct 23 15:16:34 2007 @@ -19,6 +19,7 @@ #include #include +#include #include "Y2Log.h" #include "NCstring_test.h" Modified: branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc?rev=41525&r1=41524&r2=41525&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/testsuite/utf8test.cc Tue Oct 23 15:16:34 2007 @@ -18,6 +18,8 @@ #include #include +#include +#include #include -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org