From 103d5dbdcba970c76d03a4d6bba3708eba353520 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 15 Aug 2006 07:48:45 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=10919
---
 checkin_notes                             | 6 ++++++
 client/cpu_sched.C                        | 2 +-
 client/cs_scheduler.C                     | 2 +-
 mac_build/English.lproj/InfoPlist.strings | 4 ++--
 mac_build/Info.plist                      | 2 +-
 mac_build/Installer-Info.plist            | 2 +-
 mac_build/PostInstall-Info.plist          | 2 +-
 mac_build/ScreenSaver-Info.plist          | 2 +-
 mac_build/SystemMenu-Info.plist           | 2 +-
 9 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 9d46f0ab69..5939fdf9b4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -8837,3 +8837,9 @@ Rom    14 Aug 2006
     - Tag for 5.5.13 release, all platforms
       boinc_core_release_5_5_13
 
+Charlie 15 Aug 2006
+    - Fix compiler warnings.
+    
+    client/
+        cpu_sched.C
+        cs_scheduler.C
diff --git a/client/cpu_sched.C b/client/cpu_sched.C
index 003d8db368..e4ea9cadf8 100644
--- a/client/cpu_sched.C
+++ b/client/cpu_sched.C
@@ -911,7 +911,7 @@ bool CLIENT_STATE::rr_simulation(double per_cpu_proc_rate, double rrs) {
             if (log_flags.rr_simulation) {
                 msg_printf(0, MSG_INFO,
                     "rr_simulation internal shortfall loop: idle %d, last active %d, active %d, shortfall %f: proj %s, last active %d, active %d, shortfall %f",
-                    nidle_cpus, last_active_size, active.size(), cpu_shortfall, pbest->project_name, last_proj_active_size, pbest->active.size(), pbest->cpu_shortfall);
+                    nidle_cpus, last_active_size, (int)active.size(), cpu_shortfall, pbest->project_name, last_proj_active_size, (int)pbest->active.size(), pbest->cpu_shortfall);
             }
         }
 
diff --git a/client/cs_scheduler.C b/client/cs_scheduler.C
index 6ff597d517..2625704415 100644
--- a/client/cs_scheduler.C
+++ b/client/cs_scheduler.C
@@ -625,7 +625,7 @@ bool CLIENT_STATE::compute_work_requests() {
     double prrs = potentially_runnable_resource_share();
 
     PROJECT *pbest = NULL;
-    double best_work;
+    double best_work = 0;
     for (i=0; i<projects.size(); i++) {
         PROJECT *prospect = projects[i];
         double prospect_work = time_until_work_done(prospect, 0, prrs);
diff --git a/mac_build/English.lproj/InfoPlist.strings b/mac_build/English.lproj/InfoPlist.strings
index dbc44203a4..32cff4fa9f 100755
--- a/mac_build/English.lproj/InfoPlist.strings
+++ b/mac_build/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "BOINC";
-CFBundleShortVersionString = "BOINC version 5.5.10";
-CFBundleGetInfoString = "BOINC version 5.5.10, Copyright 2006 University of California.";
+CFBundleShortVersionString = "BOINC version 5.5.13";
+CFBundleGetInfoString = "BOINC version 5.5.13, Copyright 2006 University of California.";
diff --git a/mac_build/Info.plist b/mac_build/Info.plist
index bb021573aa..7aeaa29619 100644
--- a/mac_build/Info.plist
+++ b/mac_build/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleSignature</key>
 	<string>BNC!</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.10</string>
+	<string>5.5.13</string>
 </dict>
 </plist>
diff --git a/mac_build/Installer-Info.plist b/mac_build/Installer-Info.plist
index 5bacec140d..30250ea4fb 100644
--- a/mac_build/Installer-Info.plist
+++ b/mac_build/Installer-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.10</string>
+	<string>5.5.13</string>
 </dict>
 </plist>
diff --git a/mac_build/PostInstall-Info.plist b/mac_build/PostInstall-Info.plist
index 512584b8c7..7649da407b 100644
--- a/mac_build/PostInstall-Info.plist
+++ b/mac_build/PostInstall-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.10</string>
+	<string>5.5.13</string>
 </dict>
 </plist>
diff --git a/mac_build/ScreenSaver-Info.plist b/mac_build/ScreenSaver-Info.plist
index 83f87fc346..fd55641c8d 100644
--- a/mac_build/ScreenSaver-Info.plist
+++ b/mac_build/ScreenSaver-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.10</string>
+	<string>5.5.13</string>
 	<key>NSPrincipalClass</key>
 	<string>BOINC_Saver_ModuleView</string>
 </dict>
diff --git a/mac_build/SystemMenu-Info.plist b/mac_build/SystemMenu-Info.plist
index e7e5a0f636..cd12a37512 100644
--- a/mac_build/SystemMenu-Info.plist
+++ b/mac_build/SystemMenu-Info.plist
@@ -15,6 +15,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>5.5.10</string>
+	<string>5.5.13</string>
 </dict>
 </plist>