diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt index 626d2945a..53be57e79 100644 --- a/liblangutil/CMakeLists.txt +++ b/liblangutil/CMakeLists.txt @@ -26,7 +26,6 @@ set(sources SourceReferenceFormatter.h Token.cpp Token.h - UndefMacros.h UniqueErrorReporter.h ) diff --git a/liblangutil/Token.cpp b/liblangutil/Token.cpp index d7620ef13..60b8aa798 100644 --- a/liblangutil/Token.cpp +++ b/liblangutil/Token.cpp @@ -46,7 +46,6 @@ #include - using namespace std; namespace solidity::langutil diff --git a/liblangutil/Token.h b/liblangutil/Token.h index eb8015f4d..c4907aeac 100644 --- a/liblangutil/Token.h +++ b/liblangutil/Token.h @@ -42,8 +42,6 @@ #pragma once -#include - #include #include #include diff --git a/liblangutil/UndefMacros.h b/liblangutil/UndefMacros.h deleted file mode 100644 index e3dde6d31..000000000 --- a/liblangutil/UndefMacros.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - This file is part of solidity. - - solidity is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - solidity is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with solidity. If not, see . -*/ -// SPDX-License-Identifier: GPL-3.0 -/** @file UndefMacros.h - * @author Lefteris - * @date 2015 - * - * This header should be used to #undef some really evil macros defined by - * windows.h which result in conflict with our Token.h - */ -#pragma once - -#if defined(_MSC_VER) || defined(__MINGW32__) - -#undef DELETE -#undef IN -#undef VOID -#undef THIS -#undef CONST - -// Conflicting define on MinGW in windows.h -// windows.h(19): #define interface struct -#ifdef interface -#undef interface -#endif - -#elif defined(DELETE) || defined(IN) || defined(VOID) || defined(THIS) || defined(CONST) || defined(interface) - -#error "The preceding macros in this header file are reserved for V8's "\ -"TOKEN_LIST. Please add a platform specific define above to undefine "\ -"overlapping macros." - -#endif