adapt to changes in lib

diff --git a/devel/Example.createCapabilities.cc b/devel/Example.createCapabilities.cc
index efa8bb5..bd67b2e 100644 (file)
--- a/devel/Example.createCapabilities.cc
+++ b/devel/Example.createCapabilities.cc
@@ -86,7 +86,7 @@ struct ImpatientCollector : public Collector
   virtual void doConsume( const std::string & line_r )
   {
     if ( _lineNo == 1234 )
-      ZYPP_THROW( Exception, "takes to long" );
+      ZYPP_THROW( Exception("takes to long") );
   }
 };
 ///////////////////////////////////////////////////////////////////

diff --git a/devel/devel.ma/Main.cc b/devel/devel.ma/Main.cc
index a0a399b..7001e3b 100644 (file)
--- a/devel/devel.ma/Main.cc
+++ b/devel/devel.ma/Main.cc
@@ -9,17 +9,38 @@
 #include <zypp/base/IOStream.h>
 #include <zypp/base/PtrTypes.h>
 
+#include <zypp/ByteCount.h>
 #include <zypp/CapFactory.h>
 #include <zypp/CapSet.h>
 
 using namespace std;
 using namespace zypp;
 
-namespace zypp
+
+void test( long long v )
+{
+  ByteCount b( v );
+  unsigned fw = 7;
+  unsigned sw = 1;
+  unsigned p  = 2;
+  MIL << "'" << b << "'\t"
+      << "'" << b.asString( ByteCount::B, fw, sw, p ) << "'\t"
+      << "'" << b.asString( ByteCount::K, fw, sw, p ) << "'\t"
+      << "'" << b.asString( ByteCount::M, fw, sw, p ) << "'\t"
+      << "'" << b.asString( ByteCount::G, fw, sw, p ) << "'\t"
+      << "'" << b.asString( ByteCount::T, fw, sw, p ) << "'" << endl;
+}
+void test2( long long v )
 {
-  struct foo : public base::ReferenceCounted
-  {
-  };
+  ByteCount b( v );
+  unsigned fw = 7;
+  unsigned sw = 1;
+  unsigned p  = 2;
+  MIL << b.asString( ByteCount::B ) << "-----------------" << endl;
+  MIL << "'" << b.fullBlocks( ByteCount::B ) << "'\t"
+      << "'" << b.blocks( ByteCount::B ) << endl;
+  MIL << "'" << b.fullBlocks( ByteCount::K ) << "'\t"
+      << "'" << b.blocks( ByteCount::K ) << endl;
 }
 
 /******************************************************************
@@ -31,9 +52,22 @@ int main( int argc, char * argv[] )
 {
   INT << "===[START]==========================================" << endl;
 
-  foo f;
-  SEC << f << endl;
+  for ( long long i = 1; i < 10000000000000LL; i*=2 )
+    {
+      test( i );
+    }
+
+  test2( -1025 );
+  test2( -1024 );
+  test2( -2 );
+  test2( -1 );
+  test2( 0 );
+  test2( 1 );
+  test2( 2 );
+  test2( 1024 );
+  test2( 1025 );
 
   INT << "===[END]============================================" << endl;
   return 0;
 }
+