Update MATLAB build system

2 files changed, 2 insertions, 13 deletions

diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 89a9874aac2..4bee00f7257 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -602,6 +602,7 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
         case SliceXML:
             break;
         case Java:
+        case MATLAB:
         {
             //
             // We want to shift the files left one position, so that
@@ -724,18 +725,6 @@ Slice::Preprocessor::printMakefileDependencies(ostream& out, Language lang, cons
             }
             break;
         }
-        case MATLAB:
-        {
-            //
-            // Change .o[bj] suffix to .m suffix.
-            //
-            string::size_type pos;
-            if((pos = result.find(suffix)) != string::npos)
-            {
-                result.replace(pos, suffix.size() - 1, ".m");
-            }
-            break;
-        }
         default:
         {
             assert(false);
diff --git a/cpp/src/Slice/StringLiteralUtil.cpp b/cpp/src/Slice/StringLiteralUtil.cpp
index 80c322b4d7f..6eb0e4bf650 100644
--- a/cpp/src/Slice/StringLiteralUtil.cpp
+++ b/cpp/src/Slice/StringLiteralUtil.cpp
@@ -175,7 +175,7 @@ StringLiteralGenerator::escapeASCIIChar(char c)
             // legal characters. If the trailing character after an escaped value could be consumed, we escape it
             // as well to terminate the original escape.
             //
-            if((lastFormat == OctalFormat && _octalChars.find(c) != string::npos) || 
+            if((lastFormat == OctalFormat && _octalChars.find(c) != string::npos) ||
                (lastFormat == HexFormat && _hexChars.find(c) != string::npos))
             {
                 ostringstream os;