[lmi-commits] [5477] Fix assorted warnings (VS)

[Greg Chicares]

Revision: 5477
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5477
Author:   chicares
Date:     2012-05-29 20:59:10 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Fix assorted warnings (VS)

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/census_view.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-05-29 20:28:19 UTC (rev 5476)
+++ lmi/trunk/ChangeLog 2012-05-29 20:59:10 UTC (rev 5477)
@@ -30173,3 +30173,16 @@
 Remove dependency on conditional introduced 20120528T1121Z (VS). See:
   http://lists.nongnu.org/archive/html/lmi/2012-05/msg00019.html
 
+20120529T2028Z <address@hidden> [578]
+
+  actuarial_table.cpp
+  soa_stress_test.cpp
+Tighten tolerance on binary-versus-xml tests. See:
+  http://lists.nongnu.org/archive/html/lmi/2012-05/msg00022.html
+
+20120529T2059Z <address@hidden> [578]
+
+  census_view.cpp
+Fix assorted warnings (VS). See:
+  http://lists.nongnu.org/archive/html/lmi/2012-05/msg00016.html
+

Modified: lmi/trunk/census_view.cpp
===================================================================
--- lmi/trunk/census_view.cpp   2012-05-29 20:28:19 UTC (rev 5476)
+++ lmi/trunk/census_view.cpp   2012-05-29 20:59:10 UTC (rev 5477)
@@ -41,17 +41,18 @@
 #include "input_sequence_entry.hpp"
 #include "ledger.hpp"
 #include "ledger_text_formats.hpp"
-#include "miscellany.hpp" // is_ok_for_cctype()
+#include "miscellany.hpp"               // is_ok_for_cctype()
 #include "path_utility.hpp"
 #include "safely_dereference_as.hpp"
 #include "wx_new.hpp"
-#include "wx_utility.hpp" // class ClipboardEx
+#include "wx_utility.hpp"               // class ClipboardEx
 
 #include <wx/dataview.h>
 #include <wx/datectrl.h>
 #include <wx/icon.h>
 #include <wx/menu.h>
 #include <wx/msgdlg.h>
+#include <wx/settings.h>
 #include <wx/spinctrl.h>
 #include <wx/valnum.h>
 #include <wx/wupdlock.h>
@@ -59,8 +60,9 @@
 
 #include <algorithm>
 #include <cctype>
-#include <cstdio>         // std::remove()
-#include <istream>        // std::ws
+#include <cstddef>                      // std::size_t
+#include <cstdio>                       // std::remove()
+#include <istream>                      // std::ws
 #include <iterator>
 #include <sstream>
 
@@ -1592,7 +1594,7 @@
         list_model_->RowValueChanged(j, CensusViewDataViewModel::Col_CellNum);
 
     unsigned int const newsel = std::min
-        (static_cast<unsigned int>(erasures.front())
+        (static_cast<std::size_t>(erasures.front())
         ,cell_parms().size() - 1
         );
     wxDataViewItem const& y = list_model_->GetItem(newsel);