summaryrefslogtreecommitdiff
path: root/cpp/src/iceserviceinstall/ServiceInstaller.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/iceserviceinstall/ServiceInstaller.cpp')
-rw-r--r--cpp/src/iceserviceinstall/ServiceInstaller.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
index 70669764cd0..af489da477b 100644
--- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp
+++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp
@@ -35,7 +35,7 @@ namespace
{
//
-// Replace / by \
+// Replace "/" by "\"
//
inline string
fixDirSeparator(const string& path)
@@ -807,7 +807,7 @@ IceServiceInstaller::removeSource(const string& source) const
{
throw "Could not close registry key handle: " + IceUtilInternal::errorToString(res);
}
- return subkey;
+ return string(subkey);
}
++index;
@@ -831,6 +831,8 @@ IceServiceInstaller::removeSource(const string& source) const
{
throw "Could not close registry key handle: " + IceUtilInternal::errorToString(res);
}
+
+ return ""; // To keep compilers happy.
}
string