[lmi-commits] [lmi] master b93de43 3/4: Avoid gratuitous use of long int

[Greg Chicares]

branch: master
commit b93de4301056c5cbdcf3416bc5635b8c291c245d
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Avoid gratuitous use of long int
    
    Used plain int instead of long int for calendar-date representations
    JDN and YYYYMMDD, neither of which is allowed to exceed a plain int.
    Plain int is already used in class calendar_date anyway.
---
 census_view.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/census_view.cpp b/census_view.cpp
index 600cc48..fe89bc2 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -1283,7 +1283,7 @@ void CensusView::paste_out_to_spreadsheet() const
             std::string s = cell[header].str();
             if(exact_cast<tnr_date>(cell[header]))
                 {
-                long int z = JdnToYmd(jdn_t(value_cast<long int>(s))).value();
+                int z = JdnToYmd(jdn_t(value_cast<int>(s))).value();
                 s = value_cast<std::string>(z);
                 }
             // Assume that the trailing '\t' doesn't matter.
@@ -1765,11 +1765,11 @@ void CensusView::UponPasteCensus(wxCommandEvent&)
             {
             if(exact_cast<tnr_date>(current_cell[headers[j]]))
                 {
-                static long int const jdn_min = 
calendar_date::gregorian_epoch_jdn;
-                static long int const jdn_max = 
calendar_date::last_yyyy_date_jdn;
-                static long int const ymd_min = 
JdnToYmd(jdn_t(jdn_min)).value();
-                static long int const ymd_max = 
JdnToYmd(jdn_t(jdn_max)).value();
-                long int z = value_cast<long int>(values[j]);
+                static int const jdn_min = calendar_date::gregorian_epoch_jdn;
+                static int const jdn_max = calendar_date::last_yyyy_date_jdn;
+                static int const ymd_min = JdnToYmd(jdn_t(jdn_min)).value();
+                static int const ymd_max = JdnToYmd(jdn_t(jdn_max)).value();
+                int z = value_cast<int>(values[j]);
                 if(jdn_min <= z && z <= jdn_max)
                     {
                     ; // Do nothing: JDN is the default expectation.