Fixed bug 1417

10 files changed, 30 insertions, 30 deletions

diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index e46a2a3ce97..c80913c5104 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -114,7 +114,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -122,7 +122,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -130,7 +130,7 @@ main(int argc, char* argv[])
 	includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2cppe/Main.cpp b/cpp/src/slice2cppe/Main.cpp
index 5e77f298d84..cda1051a7b7 100644
--- a/cpp/src/slice2cppe/Main.cpp
+++ b/cpp/src/slice2cppe/Main.cpp
@@ -108,7 +108,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -116,7 +116,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -124,7 +124,7 @@ main(int argc, char* argv[])
 	includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2cs/Main.cpp b/cpp/src/slice2cs/Main.cpp
index fdbb7257c34..701d0ecfc19 100644
--- a/cpp/src/slice2cs/Main.cpp
+++ b/cpp/src/slice2cs/Main.cpp
@@ -102,7 +102,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -110,7 +110,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -118,7 +118,7 @@ main(int argc, char* argv[])
 	includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2docbook/Main.cpp b/cpp/src/slice2docbook/Main.cpp
index 71593b9dd69..d876e955e1b 100644
--- a/cpp/src/slice2docbook/Main.cpp
+++ b/cpp/src/slice2docbook/Main.cpp
@@ -94,7 +94,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -102,7 +102,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -110,7 +110,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("I");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp
index a215f2f7da6..c9860371e8f 100644
--- a/cpp/src/slice2freeze/Main.cpp
+++ b/cpp/src/slice2freeze/Main.cpp
@@ -1243,7 +1243,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -1251,7 +1251,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -1259,7 +1259,7 @@ main(int argc, char* argv[])
 	includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess= opts.isSet("E");
diff --git a/cpp/src/slice2freezej/Main.cpp b/cpp/src/slice2freezej/Main.cpp
index bcb6614aeb3..770f89a4f58 100644
--- a/cpp/src/slice2freezej/Main.cpp
+++ b/cpp/src/slice2freezej/Main.cpp
@@ -1131,7 +1131,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -1139,7 +1139,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -1147,7 +1147,7 @@ main(int argc, char* argv[])
 	includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index 7180aa1c532..bb4a66ce102 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -109,7 +109,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -117,7 +117,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -125,7 +125,7 @@ main(int argc, char* argv[])
         includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2javae/Main.cpp b/cpp/src/slice2javae/Main.cpp
index 4f01d54cb92..294dccdf143 100644
--- a/cpp/src/slice2javae/Main.cpp
+++ b/cpp/src/slice2javae/Main.cpp
@@ -96,7 +96,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -104,7 +104,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -112,7 +112,7 @@ main(int argc, char* argv[])
         includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2py/Main.cpp b/cpp/src/slice2py/Main.cpp
index f2d9cc6c15d..d970dbe5557 100644
--- a/cpp/src/slice2py/Main.cpp
+++ b/cpp/src/slice2py/Main.cpp
@@ -439,7 +439,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -D" + *i;
+	    cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -447,7 +447,7 @@ main(int argc, char* argv[])
 	vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-	    cppArgs += " -U" + *i;
+	    cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -455,7 +455,7 @@ main(int argc, char* argv[])
 	includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-	    cppArgs += " -I" + *i;
+	    cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");
diff --git a/cpp/src/slice2vb/Main.cpp b/cpp/src/slice2vb/Main.cpp
index 7e107af12bb..259262a9367 100644
--- a/cpp/src/slice2vb/Main.cpp
+++ b/cpp/src/slice2vb/Main.cpp
@@ -102,7 +102,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("D");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-            cppArgs += " -D" + *i;
+            cppArgs += " -D\"" + *i + "\"";
 	}
     }
     if(opts.isSet("U"))
@@ -110,7 +110,7 @@ main(int argc, char* argv[])
         vector<string> optargs = opts.argVec("U");
 	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
 	{
-            cppArgs += " -U" + *i;
+            cppArgs += " -U\"" + *i + "\"";
 	}
     }
     if(opts.isSet("I"))
@@ -118,7 +118,7 @@ main(int argc, char* argv[])
         includePaths = opts.argVec("I");
 	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
 	{
-            cppArgs += " -I" + *i;
+            cppArgs += " -I\"" + *i + "\"";
 	}
     }
     preprocess = opts.isSet("E");