diff options
author | Bernard Normier <bernard@zeroc.com> | 2008-01-30 12:29:45 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2008-01-30 12:29:45 -0500 |
commit | d69c625a30074e22081d121b6f2350901c6feb0b (patch) | |
tree | 5de70c47ce263530962adb8c6a99ffed84d93d28 /cpp/src/Slice/Preprocessor.cpp | |
parent | x64 fixes (diff) | |
parent | Fixed array deletes (diff) | |
download | ice-d69c625a30074e22081d121b6f2350901c6feb0b.tar.bz2 ice-d69c625a30074e22081d121b6f2350901c6feb0b.tar.xz ice-d69c625a30074e22081d121b6f2350901c6feb0b.zip |
Merge branch 'master' of ssh://cvs/home/git/ice
Conflicts:
cpp/src/Slice/Preprocessor.cpp
Diffstat (limited to 'cpp/src/Slice/Preprocessor.cpp')
-rwxr-xr-x | cpp/src/Slice/Preprocessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp index 00b58d9cd00..68f68c1c851 100755 --- a/cpp/src/Slice/Preprocessor.cpp +++ b/cpp/src/Slice/Preprocessor.cpp @@ -156,7 +156,7 @@ Slice::Preprocessor::preprocess(bool keepComments) // mcpp_use_mem_buffers(1); mcpp_lib_main(static_cast<int>(args.size()) + 1, argv); - delete argv; + delete[] argv; // // Write output to temporary file. Print errors to stderr. @@ -214,7 +214,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang, const vector<strin // mcpp_use_mem_buffers(1); mcpp_lib_main(static_cast<int>(args.size() + 1), argv); - delete argv; + delete[] argv; // // Get mcpp output/errors. |