Fixed some date and time conversion functions

[AXE.git] / src / date.h

diff --git a/src/date.h b/src/date.h
index 1a4f6b0..0789ef4 100644 (file)
--- a/src/date.h
+++ b/src/date.h
@@ -5,7 +5,7 @@
 ***********************
 **      FILE NAME      : date.h
 **      SYSTEM NAME    : AXE - Andromeda X-windows Encapsulation
-**      VERSION NUMBER : $Revision: 1.1 $
+**      VERSION NUMBER : $Revision: 1.2 $
 **
 **  DESCRIPTION      :  
 **
@@ -23,12 +23,15 @@
 
 /*****************************
    $Log: date.h,v $
-   Revision 1.1  2002-07-25 08:01:26  arjen
+   Revision 1.2  2002-09-02 06:18:20  arjen
+   Fixed some date and time conversion functions
+
+   Revision 1.1  2002/07/25 08:01:26  arjen
    First checkin, AXE release 0.2
 
 *****************************/
 
-/* static const char *RCSID = "$Id: date.h,v 1.1 2002-07-25 08:01:26 arjen Exp $"; */
+/* static const char *RCSID = "$Id: date.h,v 1.2 2002-09-02 06:18:20 arjen Exp $"; */
 
 #ifndef AXE_DATE_H
 #define AXE_DATE_H
@@ -186,10 +189,10 @@ public:
    friend ostream& operator<<(ostream&, const date&);
    friend istream& operator>>(istream&, date&);
 
-   String format(const char *fmt = "%x");
+   String format(const char *fmt = "%F");
 };
 
-date today(void); 
+date today(); 
 
 class hour
 {
@@ -219,8 +222,13 @@ public:
    friend hour operator-(hour &, hour &);
 
    friend ostream& operator<<(ostream &, const hour &);
+   friend istream& operator>>(istream &, hour &);
+
+   String format(const char *fmt = "%T");
 };
 
+hour now();
+
 class UTC
 {
    hour  t;