X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=include%2Fdatetime.h;h=cd6df2c41e60caea2a5817e959cac7e0fc3c1093;hb=7ddb1aeb0b3dc7384597e75f7b3557f2d8f6d14c;hp=032fe5d8c3c62b2666ec0e6be5bf7f74d300425e;hpb=d8f51eac91f86a1e00a05a5058a8fa9eb8732464;p=fms.git

diff --git a/include/datetime.h b/include/datetime.h
index 032fe5d..cd6df2c 100644
--- a/include/datetime.h
+++ b/include/datetime.h
@@ -28,7 +28,7 @@ public:
 	void Add(const int seconds=0, const int minutes=0, const int hours=0, const int days=0, const int months=0, const int years=0);
 	
 	void Set(const int year=1970, const int month=1, const int day=1, const int hour=0, const int minute=0, const int second=0);
-	void Set(const time_t &timet);
+	void SetT(const time_t &timet);
 	void Set(const struct tm *stm);
 	void Set(const std::string &datestring);	// method only will work with a select few basic input formats
 	
@@ -67,25 +67,28 @@ public:
 	DateTime &operator-=(const double &rhs);
 	DateTime &operator-=(const DateTime &rhs);
 	
-	const bool operator==(const DateTime &rhs) const { return m_timet==rhs.m_timet; }
+	const bool operator==(const DateTime &rhs) const { return *this==rhs.m_tm; }
 	const bool operator==(const time_t &rhs) const { return m_timet==rhs; }
 	const bool operator==(const struct tm &rhs) const;
 	
-	const bool operator<(const DateTime &rhs) const { return (m_timet<rhs.m_timet); }
+	const bool operator<(const DateTime &rhs) const { return (*this<rhs.m_tm); }
 	const bool operator<(const time_t &rhs) const { return (m_timet<rhs); }
+	const bool operator<(const struct tm &rhs) const;
 	
-	const bool operator<=(const DateTime &rhs) const { return (*this<rhs || *this==rhs); }
+	const bool operator<=(const DateTime &rhs) const { return (*this<rhs.m_tm || *this==rhs.m_tm); }
 	const bool operator<=(const time_t &rhs) const { return (m_timet<=rhs); }
+	const bool operator<=(const struct tm &rhs) const { return (*this<rhs || *this==rhs); }
 	
-	const bool operator>(const DateTime &rhs) const { return (m_timet>rhs.m_timet); }
+	const bool operator>(const DateTime &rhs) const { return !(*this<=rhs.m_tm); }
 	const bool operator>(const time_t &rhs) const { return (m_timet>rhs); }
 	
-	const bool operator>=(const DateTime &rhs) const { return (*this>rhs || *this==rhs); }
+	const bool operator>=(const DateTime &rhs) const { return !(*this<rhs.m_tm); }
 	const bool operator>=(const time_t &rhs) const { return (m_timet>=rhs); }
 	
 private:
+	const time_t TimeGM(struct tm *gmtimein);
 
-	time_t m_timet;
+	time_t m_timet;		// don't use timet for any comparisons
 	struct tm m_tm;
 };