Skip to content

Commit

Permalink
- compile fixes (remove comma after last element of enum)
Browse files Browse the repository at this point in the history
svn path=/trunk/boinc/; revision=14430
  • Loading branch information
davidpanderson committed Dec 21, 2007
1 parent 97d0868 commit 481d5dd
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 13 deletions.
8 changes: 7 additions & 1 deletion checkin_notes
Original file line number Diff line number Diff line change
Expand Up @@ -12397,4 +12397,10 @@ Charlie 19 Dec 07
buildjpeg.sh
BuildMacBOINC.sh
buildWxMac.sh


David 21 Dec 2007
- compile fixes (remove comma after last element of enum)

lib/
prefs.h
common_defs.h
16 changes: 8 additions & 8 deletions doc/dg.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

require_once("docutil.php");

page_head("Desktop grid computing with BOINC");
page_head("Grid computing with BOINC");

echo "
<h2>Desktop grid versus volunteer computing</h2>
<h2>Grid versus volunteer computing</h2>
<p>
<b>Desktop grid computing</b>
<b>Grid computing</b>
is a form of distributed computing in which
an organization (such as a business)
uses its existing desktop PCs to handle its own
uses its existing computers to handle its own
long-running computational tasks.
This differs from volunteer computing in several ways:
<ul>
Expand All @@ -28,11 +28,11 @@
<li> Client deployment is typically automated.
</ul>
<h2>BOINC as a desktop grid computing platform</h2>
<h2>BOINC as a grid computing platform</h2>
<p>
Although it was originally designed for volunteer computing,
BOINC works very well for desktop grid computing.
The steps in creating a desktop grid are:
BOINC works very well for grid computing.
The steps in creating a grid are:
<ul>
<li>
<a href=trac/wiki/CreateProjectOutline>Set up a BOINC server</a>,
Expand Down Expand Up @@ -64,7 +64,7 @@
configure your firewall to prevent HTTP access to your BOINC server.
<p>
For more information on desktop grid computing using BOINC,
For more information on grid computing using BOINC,
and some useful pre-compiled software, visit
<a href=http://desktopgrid.hu/>Desktopgrid.hu</a>.
Expand Down
4 changes: 3 additions & 1 deletion doc/poll_results.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function parse_xml($resp, &$sums) {
$tag = $matches[1];
$val = $matches[2];
if (strstr($tag, 'text')) {
if ($val) {
if ($val && $resp->update_time > 1197202264) {
$val = str_replace("\\r\\n", "\n", urldecode($val));
$val = str_replace('\\\\\\', '', $val);
$d = gmdate("g:i A \U\T\C, F d Y", $resp->update_time);
Expand Down Expand Up @@ -67,6 +67,8 @@ function other_link($sums, $other_name, $link_text, $ntotal) {
$b = bar($n, $ntotal);
$y .= "$b <a href=$fname>$link_text</a>";
$f = fopen($fname, "w");
$old_name = str_replace(".html", ".old.html", $fname);
fwrite($f, "<a href=$old_name>Old responses</a><hr>\n");
foreach ($sums[$other_name] as $text) {
if (!strstr($text, '<a')) {
fwrite($f, $text);
Expand Down
2 changes: 1 addition & 1 deletion languages/translations/en.po
Original file line number Diff line number Diff line change
Expand Up @@ -751,4 +751,4 @@ msgid "HOME_BOINC"
msgstr "Berkeley Open Infrastructure for Network Computing"

msgid "HOME_BOINC_DESC"
msgstr "Open-source software for %svolunteer computing%s and %sdesktop grid computing%s.
msgstr "Open-source software for %svolunteer computing%s and %sgrid computing%s.
2 changes: 1 addition & 1 deletion lib/common_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ enum SUSPEND_REASON {
SUSPEND_REASON_BENCHMARKS = 16,
SUSPEND_REASON_DISK_SIZE = 32,
SUSPEND_REASON_CPU_USAGE_LIMIT = 64,
SUSPEND_REASON_NO_RECENT_INPUT = 128,
SUSPEND_REASON_NO_RECENT_INPUT = 128
};

// States of a result on a client.
Expand Down
2 changes: 1 addition & 1 deletion lib/prefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class TIME_SPAN {
enum TimeMode {
Always = 7000,
Never,
Between,
Between
};
TIME_SPAN()
: start_hour(0), end_hour(0) {}
Expand Down

0 comments on commit 481d5dd

Please sign in to comment.