diff options
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | include/Exceptions.h | 2 | ||||
| -rw-r--r-- | include/TaskMan.h | 4 | ||||
| -rw-r--r-- | lib/CopyJob.cc | 4 | ||||
| -rw-r--r-- | lib/ReadJob.cc | 4 | ||||
| -rw-r--r-- | lib/TaskMan.cc | 2 |
6 files changed, 9 insertions, 9 deletions
@@ -1,7 +1,7 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. echo Running gettextize... -gettextize -f -c +gettextize -c echo Running libtoolize... libtoolize -c --automake echo Running aclocal... diff --git a/include/Exceptions.h b/include/Exceptions.h index 56460a6..6862036 100644 --- a/include/Exceptions.h +++ b/include/Exceptions.h @@ -32,7 +32,7 @@ #include <stdlib.h> #endif -class MemoryException; +class GeneralException; char * xstrdup(const char *) throw (GeneralException); void * xmalloc(ssize_t) throw (GeneralException); diff --git a/include/TaskMan.h b/include/TaskMan.h index fe0d565..8f557a4 100644 --- a/include/TaskMan.h +++ b/include/TaskMan.h @@ -2,10 +2,10 @@ #define __TASKMAN_H__ #ifdef __cplusplus -#include <Task,h> +#include <Task.h> #include <vector.h> -catch TaskMan : public Base { +class TaskMan : public Base { public: TaskMan(); ~TaskMan(); diff --git a/lib/CopyJob.cc b/lib/CopyJob.cc index 6a35689..f1d3310 100644 --- a/lib/CopyJob.cc +++ b/lib/CopyJob.cc @@ -15,7 +15,7 @@ int CopyJob::Do() { r = s->read(buffer, MIN(COPY_BUFSIZ, tr)); } catch (IOAgain e) { - return TASK_WAITING_HANDLE; + return TASK_ON_HOLD; } current = 0; } @@ -24,7 +24,7 @@ int CopyJob::Do() { } catch (IOAgain e) { current = 1; - return TASK_WAITING_HANDLE; + return TASK_ON_HOLD; } cursiz += r; } diff --git a/lib/ReadJob.cc b/lib/ReadJob.cc index 8a4740a..c2a4629 100644 --- a/lib/ReadJob.cc +++ b/lib/ReadJob.cc @@ -18,7 +18,7 @@ int ReadJob::Do() { *s >> buff; } catch (IOAgain e) { - return TASK_WAITING_HANDLE; + return TASK_ON_HOLD; } current = 0; } @@ -27,7 +27,7 @@ int ReadJob::Do() { } catch (IOAgain e) { current = 1; - return TASK_WAITING_HANDLE; + return TASK_ON_HOLD; } if (buff == "") return TASK_DONE; } diff --git a/lib/TaskMan.cc b/lib/TaskMan.cc index 58c7eae..5a2f06f 100644 --- a/lib/TaskMan.cc +++ b/lib/TaskMan.cc @@ -1,3 +1,3 @@ #include <TaskMan.h> -Task::Task() ( )
\ No newline at end of file +TaskMan::TaskMan() { } |