merged bug2615

1 files changed, 1 insertions, 8 deletions

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 7b3acd99500..869dc5ca760 100755
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -284,14 +284,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin
     while((end = unprocessed.find(".ice", pos)) != string::npos)
     {
         end += 4;
-        string file = unprocessed.substr(pos, end - pos);
-
-        //
-        // Strip white space from the file name.
-        //
-        size_t b = file.find_first_not_of(" \t");
-        size_t e = file.find_last_not_of(" \t");
-        file = file.substr(b, e - b + 1);
+        string file = IceUtilInternal::trim(unprocessed.substr(pos, end - pos));
         
         //
         // Normalize paths if not relative path.