- Changes to get the client to build on IRIX:

don't use the variable name "sgi";
    include <xxx.h> instead of <cxxx>; the latter just adds
    overloaded functions that we avoid.

svn path=/trunk/boinc/; revision=17954

api/gutil.cpp

@@ -21,11 +21,11 @@
 #include "config.h"
 #endif
 
-#include <cstdio>
+#include <stdio.h>
-#include <cstdlib>
+#include <stdlib.h>
-#include <cstring>
+#include <string.h>
-#include <cmath>
+#include <math.h>
-#include <csetjmp>
+#include <setjmp.h>
 
 #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 <jpeglib.h>

api/gutil_text.cpp

@@ -23,14 +23,11 @@
 #include "config.h"
 #endif
 
-#include <cstdio>
+#include <stdio.h>
-#include <cstdlib>
+#include <stdlib.h>
-#include <cstring>
+#include <string.h>
-#include <cmath>
+#include <math.h>
-#include <csetjmp>
+#include <setjmp.h>
-
-using std::size_t;
-using std::FILE;
 
 #ifdef _WIN32
 #ifdef __cplusplus

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 <xxx.h> instead of <cxxx>; 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

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;
+        SIMPLE_GUI_INFO info;
-        retval = rpc.get_simple_gui_info(sgi);
+        retval = rpc.get_simple_gui_info(info);
-        if (!retval) sgi.print();
+        if (!retval) info.print();
     } else if (!strcmp(cmd, "--get_disk_usage")) {
         DISK_USAGE du;
         retval = rpc.get_disk_usage(du);

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__)

client/whetstone.cpp

@@ -26,11 +26,11 @@
 
 #ifndef _WIN32
 #include "config.h"
-#include <cstdlib>
+#include <stdlib.h>
-#include <cstdio>
+#include <stdio.h>
-#include <cstring>
+#include <string.h>
-#include <cmath>
+#include <math.h>
-#include <ctime>
+#include <time.h>
 #endif
 
 #include "util.h"

doc/boinc_news.php

@@ -1,6 +1,14 @@
 <?
 
 $project_news = array(
+array("April 29, 2009",
+    "An <a href=http://www.news.cornell.edu/stories/March09/cordes.palfa.einstein.html>article in Cornell's Chronicle Online</a> discusses
+    a new application in <a href=http://einstein.phys.uwm.edu/>Einstein@home</a>
+    that searches for pulsars in binary star systems."
+),
+array("April 29, 2009",
+    "Francois Grey discusses Citizen Cyberscience (and BOINC) in <a href=http://cerncourier.com/cws/article/cern/38718>The CERN Courier</a>."
+),
 array("April 21, 2009",
     "A <a href=http://event.twgrid.org/isgc2009/asiaathome/wiki/index.php/Main_Page>workshop on volunteer computing with BOINC</a>
     was held in Taipei on 16-17 April.

html/inc/stats_sites.inc

@@ -114,9 +114,8 @@ $team_stats_sites = array(
         "Boinc.be team stats",
         ""
     ),
-    array("http://www.seti-teamartbell.com/",
+    array("http://www.seti-teamartbell.com/", "Team Art Bell", ""),
-        "Team Art Bell", ""
+    array("http://www.crunchers-freiburg.de/", "crunchers@freiburg", "(German)"),
-    ),
 );
 
 // The following sites generate signature images based on user CPID

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
 

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();
+    info.projects.clear();
-    sgi.results.clear();
+    info.results.clear();
 
     retval = rpc.do_rpc("<get_simple_gui_info/>\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* 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* result = new RESULT();
                 result->parse(rpc.fin);
-                sgi.results.push_back(result);
+                info.results.push_back(result);
                 continue;
             }
         }

lib/str_util.cpp

@@ -25,10 +25,10 @@
 #ifndef _WIN32
 #include "config.h"
 #include <string>
-#include <cmath>
+#include <math.h>
-#include <cstring>
+#include <string.h>
-#include <cstdlib>
+#include <stdlib.h>
-#include <cctype>
+#include <ctype.h>
 #ifdef HAVE_ALLOCA_H
 #include "alloca.h"
 #endif