http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1722,

    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1721,
    http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=1926

1 files changed, 26 insertions, 25 deletions

diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index 75277c7cf62..a764b81e652 100755
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -137,31 +137,6 @@ static IceUtil::StaticMutex outputMutex = ICE_STATIC_MUTEX_INITIALIZER;
 
 class SMEventLoggerI : public Ice::Logger
 {
-    static string
-    mangleService(string name)
-    {
-        //
-        // The application name cannot contain backslashes.
-        //
-        string::size_type pos = 0;
-        while((pos = name.find('\\', pos)) != string::npos)
-        {
-            name[pos] = '/';
-        }
-        return name;
-    }
-
-    static string
-    createKey(string name)
-    {
-        //
-        // The registry key is:
-        //
-        // HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog\Application.
-        //
-        return "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\" + mangleService(name);
-    }
-
 public:
 
     SMEventLoggerI(const string& service)
@@ -298,6 +273,32 @@ public:
     
 private:
 
+    static string
+    mangleService(string name)
+    {
+        //
+        // The application name cannot contain backslashes.
+        //
+        string::size_type pos = 0;
+        while((pos = name.find('\\', pos)) != string::npos)
+        {
+            name[pos] = '/';
+        }
+        return name;
+    }
+
+    static string
+    createKey(string name)
+    {
+        //
+        // The registry key is:
+        //
+        // HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\EventLog\Application.
+        //
+        return "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\" + mangleService(name);
+    }
+
+
     HANDLE _source;
     static HMODULE _module;
 };