From 8488cbd1a698eb54619c9ff88f1e82cc3ba21424 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 26 Jul 2009 16:11:14 -0400 Subject: [PATCH] Bug Fix - #231 time_t/int collision on 32-bit systems - Fixed bug #231 by removing the operator int () cast from the Duration class. On a 32-bit system, "time_t" may be defined as "int", in which case the int cast and time_t cast are essentially duplicates. Thanks to Pietro Cerutti, who also provided a patch. --- AUTHORS | 1 + src/Duration.cpp | 6 ------ src/Duration.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index e15f0597a..64a7e5cb7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,6 +17,7 @@ The following submitted code, packages or analysis, and deserve special thanks: P.C. Shyamshankar Johan Friis Steven de Brouwer + Pietro Cerutti Thanks to the following, who submitted detailed bug reports and excellent suggestions: Eugene Kramer diff --git a/src/Duration.cpp b/src/Duration.cpp index 19f616a2f..b400f20d7 100644 --- a/src/Duration.cpp +++ b/src/Duration.cpp @@ -51,12 +51,6 @@ Duration::Duration (const std::string& input) parse (input); } -//////////////////////////////////////////////////////////////////////////////// -Duration::operator int () -{ - return (int) mDays; -} - //////////////////////////////////////////////////////////////////////////////// Duration::operator time_t () { diff --git a/src/Duration.h b/src/Duration.h index e02bf30bf..5204496cc 100644 --- a/src/Duration.h +++ b/src/Duration.h @@ -40,7 +40,6 @@ public: bool operator> (const Duration&); ~Duration (); // Destructor - operator int (); operator time_t (); operator std::string ();