summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/CHANGES2
-rw-r--r--cpp/src/Slice/Preprocessor.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/cpp/CHANGES b/cpp/CHANGES
index 159f5c82c1d..b286578eb4c 100644
--- a/cpp/CHANGES
+++ b/cpp/CHANGES
@@ -1,6 +1,8 @@
Changes since version 2.1.0
---------------------------
+- Fixed Slice compilers to allow file names containing whitespace.
+
- Fixed a thread pool bug on Win32 in which the file descriptors for
the pipe were not closed.
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index b05881b5d0d..40e0df6c46b 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -71,7 +71,7 @@ Slice::Preprocessor::preprocess(bool keepComments)
cmd += " -C";
}
- cmd += " " + _args + " " + _fileName;
+ cmd += " " + _args + " \"" + _fileName + "\"";
//
// Open a pipe for reading to redirect icecpp output to _cppHandle.
@@ -99,7 +99,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang)
return;
}
- cmd += " -M " + _args + " " + _fileName;
+ cmd += " -M " + _args + " \"" + _fileName + "\"";
#ifdef _WIN32
FILE* cppHandle = _popen(cmd.c_str(), "r");