summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Activator.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2019-10-29 14:11:27 -0400
committerJoe George <joe@zeroc.com>2021-02-01 16:46:20 -0500
commit9f22d436c536c18df0e3c434162048490c80191f (patch)
treeda5257cb9435bcdbe3614e4f758e36244cac5ed0 /cpp/src/IceGrid/Activator.cpp
parentFixed doxygen warnings and updated configs. (diff)
downloadice-9f22d436c536c18df0e3c434162048490c80191f.tar.bz2
ice-9f22d436c536c18df0e3c434162048490c80191f.tar.xz
ice-9f22d436c536c18df0e3c434162048490c80191f.zip
Remove IcePatch2 (#602)
Removed IcePatch2 and the corresponding distrib and patching features in IceGrid and IceGridGUI.
Diffstat (limited to 'cpp/src/IceGrid/Activator.cpp')
-rw-r--r--cpp/src/IceGrid/Activator.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index f6087267c81..23369aac08f 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -12,8 +12,6 @@
#include <IceGrid/Util.h>
#include <IceGrid/ServerI.h>
-#include <IcePatch2Lib/Util.h>
-
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@ -375,7 +373,7 @@ Activator::activate(const string& name,
throw invalid_argument("The server executable path is empty.");
}
- string pwd = IcePatch2Internal::simplify(pwdPath);
+ string pwd = simplify(pwdPath);
#ifdef _WIN32
if(!IceUtilInternal::isAbsolutePath(path))
{