From 300b220ce97ca24eec9e69aa78fd6d9cd2275a60 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Wed, 3 Jun 2015 07:21:43 +0000
Subject: [PATCH] cpp: Scope issue with macro fix #1099

git-svn-id: svn://ultimatepp.org/upp/trunk@8502 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/CppBase/Parser.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uppsrc/CppBase/Parser.cpp b/uppsrc/CppBase/Parser.cpp
index 67037c854..1a1147cb3 100644
--- a/uppsrc/CppBase/Parser.cpp
+++ b/uppsrc/CppBase/Parser.cpp
@@ -1737,8 +1737,6 @@ void  Parser::Do(Stream& in, CppBase& _base, int filei_, int filetype_,
 {
 	LLOG("= C++ Parser ==================================== " << fn);
 	base = &_base;
-	file = PreProcess(in, *this);
-	lex.Init(~file.text);
 	err = _err;
 	filei = filei_;
 	filetype = filetype_;
@@ -1756,6 +1754,9 @@ void  Parser::Do(Stream& in, CppBase& _base, int filei_, int filetype_,
 		AddNamespace(n, namespace_stack[i]);
 	}
 
+	file = PreProcess(in, *this);
+	lex.Init(~file.text);
+
 	while(lex != t_eof)
 		try {
 			try {