1 files changed, 18 insertions, 8 deletions

diff --git a/cpp/src/slice2cpp/Main.cpp b/cpp/src/slice2cpp/Main.cpp
index 0a83cfa98d2..567ccc3ae2e 100644
--- a/cpp/src/slice2cpp/Main.cpp
+++ b/cpp/src/slice2cpp/Main.cpp
@@ -51,40 +51,44 @@ main(int argc, char* argv[])
 
 	    string path = argv[idx] + 2;
 	    if (path.length())
+	    {
 		includePaths.push_back(path);
+	    }
 
 	    for (int i = idx ; i + 1 < argc ; ++i)
+	    {
 		argv[i] = argv[i + 1];
+	    }
 	    --argc;
 	}
-	else if (strncmp(argv[idx], "-D", 2) == 0 ||
-		strncmp(argv[idx], "-U", 2) == 0)
+	else if (strncmp(argv[idx], "-D", 2) == 0 || strncmp(argv[idx], "-U", 2) == 0)
 	{
 	    cpp += ' ';
 	    cpp += argv[idx];
 
 	    for (int i = idx ; i + 1 < argc ; ++i)
+	    {
 		argv[i] = argv[i + 1];
+	    }
 	    --argc;
 	}
-	else if (strcmp(argv[idx], "-h") == 0 ||
-		strcmp(argv[idx], "--help") == 0)
+	else if (strcmp(argv[idx], "-h") == 0 || strcmp(argv[idx], "--help") == 0)
 	{
 	    usage(argv[0]);
 	    return EXIT_SUCCESS;
 	}
-	else if (strcmp(argv[idx], "-v") == 0 ||
-		strcmp(argv[idx], "--version") == 0)
+	else if (strcmp(argv[idx], "-v") == 0 || strcmp(argv[idx], "--version") == 0)
 	{
 	    cout << ICE_STRING_VERSION << endl;
 	    return EXIT_SUCCESS;
 	}
-	else if (strcmp(argv[idx], "-d") == 0 ||
-		strcmp(argv[idx], "--debug") == 0)
+	else if (strcmp(argv[idx], "-d") == 0 || strcmp(argv[idx], "--debug") == 0)
 	{
 	    debug = true;
 	    for (int i = idx ; i + 1 < argc ; ++i)
+	    {
 		argv[i] = argv[i + 1];
+	    }
 	    --argc;
 	}
 	else if (strcmp(argv[idx], "--include-dir") == 0)
@@ -98,7 +102,9 @@ main(int argc, char* argv[])
 	    
 	    include = argv[idx + 1];
 	    for (int i = idx ; i + 2 < argc ; ++i)
+	    {
 		argv[i] = argv[i + 2];
+	    }
 	    argc -= 2;
 	}
 	else if (strcmp(argv[idx], "--dll-export") == 0)
@@ -112,7 +118,9 @@ main(int argc, char* argv[])
 	    
 	    dllExport = argv[idx + 1];
 	    for (int i = idx ; i + 2 < argc ; ++i)
+	    {
 		argv[i] = argv[i + 2];
+	    }
 	    argc -= 2;
 	}
 	else if (argv[idx][0] == '-')
@@ -122,7 +130,9 @@ main(int argc, char* argv[])
 	    return EXIT_FAILURE;
 	}
 	else
+	{
 	    ++idx;
+	}
     }
 
     if (argc < 2)