zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Fixed warnings.

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/162493

Fixed warnings.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/162493
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/runtime/numerics/format_integer.cpp'
--- src/runtime/numerics/format_integer.cpp	2013-04-16 22:12:03 +0000
+++ src/runtime/numerics/format_integer.cpp	2013-05-03 23:22:39 +0000
@@ -469,7 +469,7 @@
 
     bool got_grouping_separator = false;
     bool got_mandatory_digit = cp != '#';
-    int grouping_interval = 0;
+    utf8::size_type grouping_interval = 0;
     bool grouping_interval_possible = true;
     unicode::code_point grouping_separator_cp = 0;
     int grouping_separators = 0;
@@ -789,7 +789,6 @@
   store::Item_t item;
   iso639_1::type lang = iso639_1::unknown;
   iso3166_1::type country = iso3166_1::unknown;
-  bool lang_is_fallback = false;
   picture pic;
   zstring::const_iterator pic_i;
   zstring picture_str, result_str;

=== modified file 'src/runtime/numerics/format_number.cpp'
--- src/runtime/numerics/format_number.cpp	2013-04-11 04:36:24 +0000
+++ src/runtime/numerics/format_number.cpp	2013-05-03 23:22:39 +0000
@@ -375,7 +375,7 @@
   bool just_got_decimal_separator = false;
   bool just_got_grouping_separator = false;
 
-  int grouping_interval = 0;              // used only for integer part
+  utf8::size_type grouping_interval = 0;  // used only for integer part
   int grouping_separators = 0;
 
   utf8::size_type decimal_separator_pos = utf8::npos;

=== modified file 'src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp'
--- src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2013-04-08 22:59:58 +0000
+++ src/runtime/parsing_and_serializing/parsing_and_serializing_impl.cpp	2013-05-03 23:22:39 +0000
@@ -54,7 +54,6 @@
   zstring docUri;
   std::auto_ptr<std::istringstream> iss;
   std::istream *is;
-  char const *uri;
 
   PlanIteratorState* state;
   DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -71,14 +70,12 @@
       // We can't replace "iss" with "is" since we still need the auto_ptr for
       // the case when the result is not streamable.
       is = &result->getStream();
-      uri = get_uri(*is);
     }
     else
     {
       result->getStringValue2(docString);
       iss.reset(new std::istringstream(docString.c_str()));
       is = iss.get();
-      uri = nullptr;
     }
 
     baseUri = theSctx->get_base_uri();

=== modified file 'src/unit_tests/test_ato_.cpp'
--- src/unit_tests/test_ato_.cpp	2013-04-16 18:39:21 +0000
+++ src/unit_tests/test_ato_.cpp	2013-05-03 23:22:39 +0000
@@ -37,19 +37,8 @@
   return result;
 }
 
-static void print_exception( int no, char const *expr, int line,
-                             std::exception const &e ) {
-  assert_true( no, expr, line, false );
-  cout << "+ exception: " << e.what() << endl;
-}
-
 #define ASSERT_TRUE( NO, EXPR ) assert_true( NO, #EXPR, __LINE__, !!(EXPR) )
 
-#define ASSERT_NO_EXCEPTION( NO, EXPR ) \
-  try { EXPR; } \
-  catch ( exception const &e ) { print_exception( NO, #EXPR, __LINE__, e ); } \
-  catch ( ... ) { assert_true( NO, #EXPR, __LINE__, false ); }
-
 #define ASSERT_EXCEPTION( NO, EXPR, EXCEPTION ) \
   try { EXPR; assert_true( NO, #EXPR, __LINE__, false ); } \
   catch ( EXCEPTION const& ) { } \

=== modified file 'src/util/time_util.cpp'
--- src/util/time_util.cpp	2013-04-23 14:35:32 +0000
+++ src/util/time_util.cpp	2013-05-03 23:22:39 +0000
@@ -179,17 +179,23 @@
 
 int convert_wday_from( unsigned wday, type from ) {
   switch ( from ) {
-    case AD : return static_cast<int>( wday );
-    case ISO: return wday == (unsigned)iso8601::sun ? time::sun : wday;
-    default : return -1;
+    case AD:
+      return static_cast<int>( wday );
+    case ISO:
+      return wday == (unsigned)iso8601::sun ? (int)time::sun : (int)wday;
+    default:
+      return -1;
   }
 }
 
 int convert_wday_to( unsigned wday, type to ) {
   switch ( to ) {
-    case AD : return static_cast<int>( wday );
-    case ISO: return wday == (unsigned)time::sun ? iso8601::sun : wday;
-    default : return -1;
+    case AD:
+      return static_cast<int>( wday );
+    case ISO:
+      return wday == (unsigned)time::sun ? (int)iso8601::sun : (int)wday;
+    default:
+      return -1;
   }
 }