diff --git a/checkin_notes b/checkin_notes
index 3c6d2c3a9a..9e858439da 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2069,3 +2069,13 @@ David 1 Apr 2011
Makefile.am
client/
coproc_detect.cpp
+
+David 1 Apr 2011
+ - scheduler: removed unused destructors in COPROC that
+ caused scheduler to crash (not sure why)
+
+ sched/
+ sched_types.cpp,h
+ lib/
+ coproc.h
+ procinfo.h
diff --git a/doc/addons.php b/doc/addons.php
index 99dbfc16df..39bed52c11 100644
--- a/doc/addons.php
+++ b/doc/addons.php
@@ -24,7 +24,7 @@ Instructions for installing and running BOINC are
here.
To submit an item for inclusion in this list,
-please email David Anderson.
+please email David Anderson.
";
diff --git a/lib/coproc.h b/lib/coproc.h
index 228ab0478c..a06e060c66 100644
--- a/lib/coproc.h
+++ b/lib/coproc.h
@@ -203,7 +203,6 @@ struct COPROC {
COPROC() {
clear();
}
- virtual ~COPROC(){}
void print_available_ram();
};
@@ -242,7 +241,6 @@ struct COPROC_NVIDIA : public COPROC {
virtual void write_xml(MIOFILE&, bool include_request);
#endif
COPROC_NVIDIA(): COPROC("NVIDIA"){}
- virtual ~COPROC_NVIDIA(){}
void get(
bool use_all,
std::vector&, std::vector&,
@@ -282,7 +280,6 @@ struct COPROC_ATI : public COPROC {
virtual void write_xml(MIOFILE&, bool include_request);
#endif
COPROC_ATI(): COPROC("ATI"){}
- virtual ~COPROC_ATI(){}
void get(
bool use_all,
std::vector&, std::vector&,
@@ -307,8 +304,6 @@ struct COPROCS {
COPROC_NVIDIA nvidia;
COPROC_ATI ati;
- COPROCS(){}
- ~COPROCS(){} // don't delete coprocs; else crash in APP_INIT_DATA logic
void write_xml(MIOFILE& out, bool include_request);
void get(
bool use_all, std::vector &descs,
diff --git a/lib/procinfo.cpp b/lib/procinfo.cpp
index d26cc468b0..9d6baec443 100644
--- a/lib/procinfo.cpp
+++ b/lib/procinfo.cpp
@@ -17,17 +17,17 @@
// platform-independent process-enumeration functions
-#if defined(_WIN32) && !defined(__STDWX_H__)
-#include "boinc_win.h"
-#elif defined(_WIN32) && defined(__STDWX_H__)
-#include "stdwx.h"
-#else
-#include "config.h"
+#if defined(_WIN32) && !defined(__STDWX_H__)
+#include "boinc_win.h"
+#elif defined(_WIN32) && defined(__STDWX_H__)
+#include "stdwx.h"
+#else
+#include "config.h"
#include
#include
#include
#include
-#endif
+#endif
#include "procinfo.h"
diff --git a/sched/sched_types.cpp b/sched/sched_types.cpp
index beb99d0786..b62490d1e7 100644
--- a/sched/sched_types.cpp
+++ b/sched/sched_types.cpp
@@ -177,13 +177,6 @@ void WORK_REQ::add_no_work_message(const char* message) {
no_work_messages.push_back(USER_MESSAGE(message, "notice"));
}
-
-SCHEDULER_REQUEST::SCHEDULER_REQUEST() {
-}
-
-SCHEDULER_REQUEST::~SCHEDULER_REQUEST() {
-}
-
// return an error message or NULL
//
const char* SCHEDULER_REQUEST::parse(FILE* fin) {
diff --git a/sched/sched_types.h b/sched/sched_types.h
index 4eeaab0a87..f22f78d959 100644
--- a/sched/sched_types.h
+++ b/sched/sched_types.h
@@ -315,8 +315,8 @@ struct SCHEDULER_REQUEST {
int last_rpc_dayofyear;
int current_rpc_dayofyear;
- SCHEDULER_REQUEST();
- ~SCHEDULER_REQUEST();
+ SCHEDULER_REQUEST(){};
+ ~SCHEDULER_REQUEST(){};
const char* parse(FILE*);
int write(FILE*); // write request info to file: not complete
};