Changeset 916

Timestamp:

04/23/10 17:25:05 (15 years ago)

Author:

mido

Message:

small patch and adaptation of testsuite/logger_test.cpp

Location:

library

Files:

• bdm/base/bdmbase.h (modified) (2 diffs)
• tests/testsuite/logger_test.cpp (modified) (2 diffs)

library/bdm/base/bdmbase.h

@@ -308 +308 @@
         string store_id_and_give_name( enum T::log_level_enums const log_level_enum,  int enum_subindex, int id ) {
                 int ids_len = ids(log_level_enum).length();
-                if( ids(log_level_enum).length() < enum_subindex )
-                        ids(log_level_enum).set_size( enum_subindex );
+                if( ids(log_level_enum).length() <= enum_subindex )
+                        ids(log_level_enum).set_size( enum_subindex+1, true );
                 ids(log_level_enum)(enum_subindex) = id; 
 
@@ -322 +322 @@
 
                 // add number to name only in the case there are more registered vectors with the same log_level_enum
-                if( ids_len > 0 )
-                        stream << "[" << enum_subindex << "]";
+                if( ids(log_level_enum).length() > 1 )
+                        stream << "*" << enum_subindex;
                 
                 return stream.str();

library/tests/testsuite/logger_test.cpp

@@ -53 +53 @@
                 L.add_vector( log_level, logr, r, prefix );
                 L.add_vector( log_level, logth, th, prefix );
-                L.add_setting( log_level, logpol, prefix );
+                L.add_setting( log_level, logpol, prefix, 0 );
+                L.add_setting( log_level, logpol, prefix, 1 );
         }
 
@@ -60 +61 @@
                 log_level.store( logr, vec_2 ( ( double ) i, ( double ) ( i + 1 ) ) );
                 log_level.store( logth, vec_2 ( ( double ) ( 100 - i ), ( double ) ( i - 50 ) ) );
-                log_level.store( logpol, pol );
+                log_level.store( logpol, pol, 0 );
+                log_level.store( logpol, pol^2, 1 );
         }