From ca5d1ed280b397d282089d5f83efaf848715a1ec Mon Sep 17 00:00:00 2001 From: triton Date: Mon, 23 Sep 2013 19:35:13 +0100 Subject: [PATCH] Revert "Move all the code in the old parser to the CppSharp::Parser namespace." This reverts commit 6297ec532e5a38b11fc7d701388410cdf8a4ece8. --- src/Parser/Comments.cpp | 1 - src/Parser/Main.cpp | 2 -- src/Parser/Options.h | 6 +----- src/Parser/Parser.cpp | 2 -- src/Parser/Parser.h | 4 ---- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/Parser/Comments.cpp b/src/Parser/Comments.cpp index 7afac1b7..53cc4558 100644 --- a/src/Parser/Comments.cpp +++ b/src/Parser/Comments.cpp @@ -9,7 +9,6 @@ #include "Interop.h" #include -using namespace CppSharp::Parser; //-----------------------------------// diff --git a/src/Parser/Main.cpp b/src/Parser/Main.cpp index eea74f3e..d68ccca0 100644 --- a/src/Parser/Main.cpp +++ b/src/Parser/Main.cpp @@ -8,8 +8,6 @@ #include "Parser.h" #include "Interop.h" -using namespace CppSharp::Parser; - public ref class ClangParser { public: diff --git a/src/Parser/Options.h b/src/Parser/Options.h index 3536fea6..2b410e86 100644 --- a/src/Parser/Options.h +++ b/src/Parser/Options.h @@ -9,8 +9,6 @@ #include using namespace System::Collections::Generic; -namespace CppSharp { namespace Parser { - public ref struct ParserOptions { ParserOptions() @@ -90,6 +88,4 @@ enum class SourceLocationKind CommandLine, System, User -}; - -} } \ No newline at end of file +}; \ No newline at end of file diff --git a/src/Parser/Parser.cpp b/src/Parser/Parser.cpp index 9e8f828b..ea5a0389 100644 --- a/src/Parser/Parser.cpp +++ b/src/Parser/Parser.cpp @@ -31,8 +31,6 @@ #include #include -using namespace CppSharp::Parser; - //-----------------------------------// Parser::Parser(ParserOptions^ Opts) : Lib(Opts->Library), Opts(Opts), Index(0) diff --git a/src/Parser/Parser.h b/src/Parser/Parser.h index 5743e936..b8ebd0b5 100644 --- a/src/Parser/Parser.h +++ b/src/Parser/Parser.h @@ -38,8 +38,6 @@ namespace clang { #define Debug printf -namespace CppSharp { namespace Parser { - struct Parser { Parser(ParserOptions^ Opts); @@ -108,5 +106,3 @@ protected: clang::TargetCodeGenInfo* CodeGenInfo; clang::CodeGen::CodeGenTypes* CodeGenTypes; }; - -} } \ No newline at end of file