From 3ca5c8ac21546bb5eb86ffc319be0cb28671b73d Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Tue, 23 Mar 2010 09:52:05 +0000 Subject: [PATCH] Mac SS: Fix build break due to RPC changes of std::string to char[n] svn path=/trunk/boinc/; revision=20985 --- checkin_notes | 6 ++++++ clientscr/screensaver.cpp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 915bc255ed..87421c7725 100644 --- a/checkin_notes +++ b/checkin_notes @@ -2051,3 +2051,9 @@ David 22 Mar 2010 BOINCBaseFrame.h lib/ mfile.cpp + +Charlie 23 Mar 2010 + - Mac SS: Fix build break due to RPC changes of std::string to char[n]. + + clientscr/ + screensaver.cpp diff --git a/clientscr/screensaver.cpp b/clientscr/screensaver.cpp index c2a32510f5..5dcdf9a452 100644 --- a/clientscr/screensaver.cpp +++ b/clientscr/screensaver.cpp @@ -176,14 +176,14 @@ int CScreensaver::launch_screensaver(RESULT* rp, int& graphics_application) char* argv[5]; argv[0] = "gfx_Switcher"; argv[1] = "-launch_gfx"; - argv[2] = strrchr(rp->slot_path.c_str(), '/'); + argv[2] = strrchr(rp->slot_path, '/'); if (*argv[2]) argv[2]++; // Point to the slot number in ascii argv[3] = "--fullscreen"; argv[4] = 0; retval = run_program( - rp->slot_path.c_str(), + rp->slot_path, m_gfx_Switcher_Path, 4, argv,