r261: Use explicit std:: namespace

[ctsim.git] / include / ctsupport.h

diff --git a/include/ctsupport.h b/include/ctsupport.h
index ce05b3bb59e9cc3b737f0f07eb9ec61984653305..ba6030d95e3ec51c936e19d137c5e626405d4d05 100644 (file)
--- a/include/ctsupport.h
+++ b/include/ctsupport.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsupport.h,v 1.10 2000/12/06 16:41:17 kevin Exp $
+**  $Id: ctsupport.h,v 1.13 2000/12/16 06:12:47 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -48,9 +48,6 @@
 #define TRUE   1
 #define FALSE  0
 #define OK     TRUE
-#define ERROR  FALSE
-#define YES    TRUE
-#define NO     FALSE
 
 /*----------------------------------------------------------------------*/
 
@@ -65,25 +62,6 @@
 
 /*----------------------------------------------------------------------*/
 
-struct time_st {
-       int hour, minute, second, ms;
-};
-
-struct date_st {
-       int year, month, date, dow;
-};
-
-struct timedate_st {
-    struct time_st t;
-    struct date_st d;
-};
-
-typedef struct time_st TIME;
-typedef struct date_st DATE;
-typedef struct timedate_st TIMEDATE;
-
-/*----------------------------------------------------------------------*/
-
 #define ERR_WARNING    0
 #define ERR_SEVERE     1
 #define ERR_FATAL      2
@@ -104,7 +82,7 @@ typedef struct timedate_st TIMEDATE;
 
 /*----------------------------------------------------------------------*/
 
-#ifndef O_BINARY
+#if !defined(O_BINARY) && !defined(MSVC)
 #define O_BINARY (0)
 #endif
 
@@ -170,25 +148,6 @@ void sys_error(int severity, const char *msg, ...);
 void sys_verror(int severity, const char *msg, va_list arg);
 void sys_error_level(int severity);
 
-/* timedate.cpp */
-DATE *td_get_date(DATE *d);
-TIME *td_get_time(TIME *t);
-double td_current_sec(void);
-double td_time_to_sec(TIME *t);
-TIME *td_time_sub(const TIME *t1, const TIME *t2, TIME *tdiff);
-TIME *td_time_add(const TIME *t1, const TIME *t2, TIME *tsum);
-TIME *td_time_copy(TIME *to, const TIME *from);
-TIME *td_time_norm(TIME *t);
-void td_get_tmdt(TIMEDATE *td);
-const char *td_str_tmdt(const TIMEDATE *td);
-const char *td_str_time(const TIME *t);
-const char *td_str_stime(const TIME *t);
-const char *td_str_date(const DATE *d);
-char *td_str_cdate(DATE *d);
-char *td_month_name(int n);
-char *td_day_name(int n);
-
-
 // Math Section
 
 #include <cmath>
@@ -225,6 +184,9 @@ inline T nearest (double x)
 inline int imax (int a, int b)\r
 { return (a >= b ? a : b); }\r
 \r
+inline double dmax (double a, double b)\r
+{ return (a >= b ? a : b); }\r
+\r
 template<class T>
 inline T clamp (T value, T lowerBounds, T upperBounds)
 { return (value >= upperBounds ? upperBounds : (value <= lowerBounds ? lowerBounds : value )); }