diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Exceptions.h | 2 | ||||
| -rw-r--r-- | include/Handle.h | 2 | ||||
| -rw-r--r-- | include/String.h | 6 | ||||
| -rw-r--r-- | include/Task.h | 2 | ||||
| -rw-r--r-- | include/TaskMan.h | 12 | ||||
| -rw-r--r-- | include/Variables.h | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/include/Exceptions.h b/include/Exceptions.h index 85451f0..ef697e7 100644 --- a/include/Exceptions.h +++ b/include/Exceptions.h @@ -84,7 +84,7 @@ INLINE void Base::free(char *& p) { xfree(p); } -INLINE int Base::pipe(int * p, int flag = 0) { +INLINE int Base::pipe(int * p, int flag) { return xpipe(p, flag); } diff --git a/include/Handle.h b/include/Handle.h index 3b9c9dc..6e26e9c 100644 --- a/include/Handle.h +++ b/include/Handle.h @@ -4,7 +4,7 @@ #include <zlib.h> #include <unistd.h> -#include <iostream.h> +#include <iostream> #include <String.h> #include <Exceptions.h> diff --git a/include/String.h b/include/String.h index a0d9220..f8db2c7 100644 --- a/include/String.h +++ b/include/String.h @@ -2,7 +2,7 @@ #define __STRING_H__ #ifdef __cplusplus -#include <iostream.h> +#include <iostream> #include <string.h> #include <Exceptions.h> @@ -56,8 +56,8 @@ class String : public Base { size_t siz; }; -ostream & operator<<(ostream &, const String &); -istream & operator>>(istream &, String &); +std::ostream & operator<<(std::ostream &, const String &); +std::istream & operator>>(std::istream &, String &); #else #error This only works with a C++ compiler diff --git a/include/Task.h b/include/Task.h index b6f9b2e..17df72e 100644 --- a/include/Task.h +++ b/include/Task.h @@ -4,7 +4,7 @@ #include <unistd.h> #include <sys/time.h> -#include <vector.h> +#include <vector> #include <Exceptions.h> #include <Handle.h> diff --git a/include/TaskMan.h b/include/TaskMan.h index 2cab500..a3b03ab 100644 --- a/include/TaskMan.h +++ b/include/TaskMan.h @@ -4,7 +4,7 @@ #include <signal.h> #include <Task.h> -#include <vector.h> +#include <vector> #define E_BURST 0 #define E_HANDLE 1 @@ -15,7 +15,7 @@ class TaskMan : public Base { public: static void AddTask(Task *); - static vector<Task *>::iterator FindTask(Task *) throw (GeneralException); + static std::vector<Task *>::iterator FindTask(Task *) throw (GeneralException); static void RemoveFromWatches(Task *); static void Init() throw (GeneralException); static void MainLoop() throw (GeneralException); @@ -54,16 +54,16 @@ class TaskMan : public Base { int flags; Task * T; }; - typedef vector<Task *> TaskList_t; + typedef std::vector<Task *> TaskList_t; private: static TaskList_t TaskList; static TaskList_t Zombies; static int number; static bool inited; - static vector<w4ha_t> w4ha; - static vector<w4pr_t> w4pr; - static vector<w4to_t> w4to; + static std::vector<w4ha_t> w4ha; + static std::vector<w4pr_t> w4pr; + static std::vector<w4to_t> w4to; static bool stopped; static int event; static Task * etask; diff --git a/include/Variables.h b/include/Variables.h index 8d7189b..c82ad87 100644 --- a/include/Variables.h +++ b/include/Variables.h @@ -2,7 +2,7 @@ #define __VARIABLES_H__ #ifdef __cplusplus -#include <vector.h> +#include <vector> #include <String.h> #include <Handle.h> #include <Exceptions.h> @@ -22,7 +22,7 @@ class Variables : public Base { void Del(const String &); private: - vector<String> Vars; + std::vector<String> Vars; int nbvars; }; |