From fba2e5ee3dae8fc424805cf6bfadc0c84cde72d9 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Thu, 30 Apr 2009 21:48:20 +0000 Subject: [PATCH] - Changes to get the client to build on IRIX: don't use the variable name "sgi"; include instead of ; the latter just adds overloaded functions that we avoid. svn path=/trunk/boinc/; revision=17954 --- api/gutil.cpp | 14 +++++--------- api/gutil_text.cpp | 13 +++++-------- checkin_notes | 20 ++++++++++++++++++++ client/boinc_cmd.cpp | 6 +++--- client/hostinfo_unix.cpp | 10 ++++++++++ client/whetstone.cpp | 10 +++++----- doc/boinc_news.php | 8 ++++++++ html/inc/stats_sites.inc | 5 ++--- lib/diagnostics.h | 2 ++ lib/gui_rpc_client_ops.cpp | 10 +++++----- lib/str_util.cpp | 8 ++++---- 11 files changed, 69 insertions(+), 37 deletions(-) diff --git a/api/gutil.cpp b/api/gutil.cpp index 2fc794a81e..0f1cafcc68 100644 --- a/api/gutil.cpp +++ b/api/gutil.cpp @@ -21,11 +21,11 @@ #include "config.h" #endif -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef _WIN32 @@ -57,10 +57,6 @@ extern "C" { #undef HAVE_STDLIB_H /* Avoid compiler warning (redefined in jconfig,h) */ #endif -using std::FILE; -using std::longjmp; -using std::jmp_buf; - #ifndef SANS_JPEGLIB extern "C"{ #include diff --git a/api/gutil_text.cpp b/api/gutil_text.cpp index f394736767..8b63a8995f 100644 --- a/api/gutil_text.cpp +++ b/api/gutil_text.cpp @@ -23,14 +23,11 @@ #include "config.h" #endif -#include -#include -#include -#include -#include - -using std::size_t; -using std::FILE; +#include +#include +#include +#include +#include #ifdef _WIN32 #ifdef __cplusplus diff --git a/checkin_notes b/checkin_notes index 9870d41abb..d37b953f8c 100644 --- a/checkin_notes +++ b/checkin_notes @@ -4221,3 +4221,23 @@ David 28 Apr 2009 db/ db_base.cpp + +David 30 Apr 2009 + - Changes to get the client to build on IRIX: + don't use the variable name "sgi"; + include instead of ; the latter just adds + overloaded functions that we avoid. + + api/ + gutil.cpp + gutil_text.cpp + client/ + boinc_cmd.cpp + hostinfo_unix.cpp + whetstone.cpp + html/inc/ + stats_sites.inc + lib/ + diagnostics.h + gui_rpc_client_ops.cpp + str_util.cpp diff --git a/client/boinc_cmd.cpp b/client/boinc_cmd.cpp index 57902c7e21..09f4c4aa7e 100644 --- a/client/boinc_cmd.cpp +++ b/client/boinc_cmd.cpp @@ -226,9 +226,9 @@ int main(int argc, char** argv) { retval = rpc.get_project_status(ps); if (!retval) ps.print(); } else if (!strcmp(cmd, "--get_simple_gui_info")) { - SIMPLE_GUI_INFO sgi; - retval = rpc.get_simple_gui_info(sgi); - if (!retval) sgi.print(); + SIMPLE_GUI_INFO info; + retval = rpc.get_simple_gui_info(info); + if (!retval) info.print(); } else if (!strcmp(cmd, "--get_disk_usage")) { DISK_USAGE du; retval = rpc.get_disk_usage(du); diff --git a/client/hostinfo_unix.cpp b/client/hostinfo_unix.cpp index 5a11539c03..d6e25581f0 100644 --- a/client/hostinfo_unix.cpp +++ b/client/hostinfo_unix.cpp @@ -705,14 +705,24 @@ int HOST_INFO::get_host_info() { size_t len; // Get machine +#ifdef IRIX + mib[0] = 0; + mib[1] = 1; +#else mib[0] = CTL_HW; mib[1] = HW_MACHINE; +#endif len = sizeof(p_vendor); sysctl(mib, 2, &p_vendor, &len, NULL, 0); // Get model +#ifdef IRIX + mib[0] = 0; + mib[1] = 1; +#else mib[0] = CTL_HW; mib[1] = HW_MODEL; +#endif len = sizeof(p_model); sysctl(mib, 2, &p_model, &len, NULL, 0); #elif defined(__osf__) diff --git a/client/whetstone.cpp b/client/whetstone.cpp index b4298ab8c1..88d24f82f8 100644 --- a/client/whetstone.cpp +++ b/client/whetstone.cpp @@ -26,11 +26,11 @@ #ifndef _WIN32 #include "config.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif #include "util.h" diff --git a/doc/boinc_news.php b/doc/boinc_news.php index 22d887cb31..b3839a2077 100644 --- a/doc/boinc_news.php +++ b/doc/boinc_news.php @@ -1,6 +1,14 @@ article in Cornell's Chronicle Online discusses + a new application in Einstein@home + that searches for pulsars in binary star systems." +), +array("April 29, 2009", + "Francois Grey discusses Citizen Cyberscience (and BOINC) in The CERN Courier." +), array("April 21, 2009", "A workshop on volunteer computing with BOINC was held in Taipei on 16-17 April. diff --git a/html/inc/stats_sites.inc b/html/inc/stats_sites.inc index 510d4140ba..d6a6136e4c 100644 --- a/html/inc/stats_sites.inc +++ b/html/inc/stats_sites.inc @@ -114,9 +114,8 @@ $team_stats_sites = array( "Boinc.be team stats", "" ), - array("http://www.seti-teamartbell.com/", - "Team Art Bell", "" - ), + array("http://www.seti-teamartbell.com/", "Team Art Bell", ""), + array("http://www.crunchers-freiburg.de/", "crunchers@freiburg", "(German)"), ); // The following sites generate signature images based on user CPID diff --git a/lib/diagnostics.h b/lib/diagnostics.h index a897b36bfa..a9be37cdc7 100644 --- a/lib/diagnostics.h +++ b/lib/diagnostics.h @@ -187,7 +187,9 @@ extern void set_signal_exit_code(int); #else // _DEBUG #define BOINCASSERT(expr) +#ifndef IRIX #define BOINCTRACE(...) +#endif #endif // _DEBUG diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp index fef929cedd..1c16917616 100644 --- a/lib/gui_rpc_client_ops.cpp +++ b/lib/gui_rpc_client_ops.cpp @@ -1210,14 +1210,14 @@ int RPC_CLIENT::get_file_transfers(FILE_TRANSFERS& t) { return retval; } -int RPC_CLIENT::get_simple_gui_info(SIMPLE_GUI_INFO& sgi) { +int RPC_CLIENT::get_simple_gui_info(SIMPLE_GUI_INFO& info) { int retval; SET_LOCALE sl; char buf[256]; RPC rpc(this); - sgi.projects.clear(); - sgi.results.clear(); + info.projects.clear(); + info.results.clear(); retval = rpc.do_rpc("\n"); if (!retval) { @@ -1226,13 +1226,13 @@ int RPC_CLIENT::get_simple_gui_info(SIMPLE_GUI_INFO& sgi) { else if (match_tag(buf, "")) { PROJECT* project = new PROJECT(); project->parse(rpc.fin); - sgi.projects.push_back(project); + info.projects.push_back(project); continue; } else if (match_tag(buf, "")) { RESULT* result = new RESULT(); result->parse(rpc.fin); - sgi.results.push_back(result); + info.results.push_back(result); continue; } } diff --git a/lib/str_util.cpp b/lib/str_util.cpp index adb98d5b64..7a2afb0bf4 100644 --- a/lib/str_util.cpp +++ b/lib/str_util.cpp @@ -25,10 +25,10 @@ #ifndef _WIN32 #include "config.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef HAVE_ALLOCA_H #include "alloca.h" #endif