From 85d65bd8494c0c0235a9f61d51d465ecd19a5877 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 13 Jan 2009 20:02:50 +0000 Subject: [PATCH] - client: GPU bug fix; compile warning fixes svn path=/trunk/boinc/; revision=16901 --- checkin_notes | 11 +++++++++++ client/client_types.cpp | 2 +- clientgui/BOINCTaskBar.cpp | 3 ++- lib/filesys.cpp | 3 ++- lib/parse.cpp | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index f6acfd5f11..186d3af6eb 100644 --- a/checkin_notes +++ b/checkin_notes @@ -246,3 +246,14 @@ David 13 Jan 2009 lib/ gui_rpc_client_ops.cpp gui_rpc_client.h + +David 13 Jan 2009 + - client: GPU bug fix; compile warning fixes + + client/ + client_types.cpp + clientgui/ + BOINCTaskBar.cpp + lib/ + filesys.cpp + parse.cpp diff --git a/client/client_types.cpp b/client/client_types.cpp index 0798f33b50..9b8b1f76a8 100644 --- a/client/client_types.cpp +++ b/client/client_types.cpp @@ -1139,7 +1139,7 @@ int APP_VERSION::parse(MIOFILE& in) { int retval = cp->parse(in); if (!retval) { coprocs.coprocs.push_back(cp); - ncudas = cp->used; + ncudas = cp->count; } else { msg_printf(0, MSG_INTERNAL_ERROR, "Error parsing "); delete cp; diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index eb398cf3eb..7e157d2913 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -358,7 +358,8 @@ void CTaskBarIcon::OnMouseMove(wxTaskBarIconEvent& WXUNUSED(event)) { if (iActiveTaskCount > 2) continue; if (result) { - state_result = pDoc->state.lookup_result(result->project_url, result->name); + PROJECT* project = pDoc->state.lookup_project(result->project_url); + state_result = pDoc->state.lookup_result(project, result->name); if (state_result) { state_result->project->get_name(project_name); strProjectName = wxString(project_name.c_str()); diff --git a/lib/filesys.cpp b/lib/filesys.cpp index a439ab432e..8b8455cb6d 100644 --- a/lib/filesys.cpp +++ b/lib/filesys.cpp @@ -675,8 +675,8 @@ void relative_to_absolute(const char* relname, char* path) { // get total and free space on current filesystem (in bytes) // -int get_filesystem_info(double &total_space, double &free_space, char* path) { #ifdef _WIN32 +int get_filesystem_info(double &total_space, double &free_space, char*) { char buf[256]; boinc_getcwd(buf); FreeFn pGetDiskFreeSpaceEx; @@ -709,6 +709,7 @@ int get_filesystem_info(double &total_space, double &free_space, char* path) { total_space = (double)dwTotalClusters * dwSectPerClust * dwBytesPerSect; } #else +int get_filesystem_info(double &total_space, double &free_space, char* path) { #ifdef STATFS struct STATFS fs_info; diff --git a/lib/parse.cpp b/lib/parse.cpp index 721109b56d..a302b9b713 100644 --- a/lib/parse.cpp +++ b/lib/parse.cpp @@ -165,7 +165,7 @@ int dup_element_contents(FILE* in, const char* end_tag, char** pp) { free(buf); return 0; } - int n = strlen(line); + int n = (int)strlen(line); if (nused + n >= bufsize) { bufsize *= 2; buf = (char*)realloc(buf, bufsize);