From 3b605a2a7e66a1d6543ff510f0985e013dc840ca Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 4 Sep 2009 13:02:31 +0200 Subject: [PATCH] fix tools to compile --- VERSION.cmake | 4 ++-- tools/NameReqPrv.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 90d200b..87f37c6 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "11") SET(LIBZYPP_MINOR "14") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 6.14.1 (11) +# LAST RELEASED: 6.14.2 (11) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/tools/NameReqPrv.cc b/tools/NameReqPrv.cc index 1d847b2..47a83a8 100644 --- a/tools/NameReqPrv.cc +++ b/tools/NameReqPrv.cc @@ -48,8 +48,8 @@ void tableOut( const std::string & s1 = std::string(), const std::string & s5 = std::string() ) { message << " "; -#define TABEL(N) static unsigned w##N = 0; if ( ! s##N.empty() ) w##N = std::max( w##N, s##N.size() ); message << str::form( " %-*s ", w##N, s##N.c_str() ) -#define TABER(N) static unsigned w##N = 0; if ( ! s##N.empty() ) w##N = std::max( w##N, s##N.size() ); message << str::form( " %*s ", w##N, s##N.c_str() ) +#define TABEL(N) static unsigned w##N = 0; if ( ! s##N.empty() ) w##N = std::max( w##N, unsigned(s##N.size()) ); message << str::form( " %-*s ", w##N, s##N.c_str() ) +#define TABER(N) static unsigned w##N = 0; if ( ! s##N.empty() ) w##N = std::max( w##N, unsigned(s##N.size()) ); message << str::form( " %*s ", w##N, s##N.c_str() ) TABER( 1 ); TABEL( 2 ); TABEL( 3 ); TABEL( 4 ); TABEL( 5 ); #undef TABEL message << endl; @@ -210,4 +210,4 @@ int main( int argc, char * argv[] ) INT << "===[END]============================================" << endl << endl; return 0; -} \ No newline at end of file +} -- 2.7.4