Updated wrong file version.

lib/Interpreter/ASTNodeEraser.cpp

@@ -750,8 +750,7 @@ namespace cling {
     const MacroInfo* MI = MD->getMacroInfo();
 
     // If the macro is not defined, this is a noop undef, just return.
-    if (MI == 0)
+    if (MI == 0) return false;
-      return false;
 
     // Remove the pair from the macros
     PP.removeMacro(MacroD.m_II, const_cast<MacroDirective*>(MacroD.m_MD));
@@ -785,6 +784,11 @@ namespace cling {
       }
     }
 
+    for (Transaction::const_reverse_macros_iterator MI = T->rmacros_begin(),
+          ME = T->rmacros_end(); MI != ME; ++MI) {
+      // Get rid of the macro definition
+      Successful = DeclRev.RevertMacro(*MI) && Successful;
+    }
 #ifndef NDEBUG
     assert(Successful && "Cannot handle that yet!");
 #endif

lib/Interpreter/Interpreter.cpp

@@ -42,12 +42,9 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include <iostream>
-#include <fstream>
 #include <sstream>
 #include <string>
 #include <vector>
-#include <unistd.h>
 
 using namespace clang;
 
@@ -653,7 +650,6 @@ namespace cling {
 
   Interpreter::ExecutionResult
   Interpreter::RunFunction(const FunctionDecl* FD, StoredValueRef* res /*=0*/) {
-
     if (getCI()->getDiagnostics().hasErrorOccurred())
       return kExeCompilationError;
 
@@ -867,7 +863,6 @@ namespace cling {
                                 const CompilationOptions& CO,
                                 StoredValueRef* V, /* = 0 */
                                 Transaction** T /* = 0 */) {
-
     // Disable warnings which doesn't make sense when using the prompt
     // This gets reset with the clang::Diagnostics().Reset()
     ignoreFakeDiagnostics();