cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13573 from ethereum/undef-macros

Browse Source 
Drop deprecated UndefMacros file
This commit is contained in:
Kamil Śliwak 2022-10-04 17:31:42 +02:00 committed by GitHub
commit 23118d62e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
liblangutil/CMakeLists.txt
View File

@ -26,7 +26,6 @@ set(sources
SourceReferenceFormatter.h SourceReferenceFormatter.h
Token.cpp Token.cpp
Token.h Token.h
UndefMacros.h
UniqueErrorReporter.h UniqueErrorReporter.h
) )

1
liblangutil/Token.cpp
View File

@ -46,7 +46,6 @@
#include <map> #include <map>
using namespace std; using namespace std;
namespace solidity::langutil namespace solidity::langutil

2
liblangutil/Token.h
View File

@ -42,8 +42,6 @@
#pragma once #pragma once
#include <liblangutil/UndefMacros.h>
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
#include <tuple> #include <tuple>

47
liblangutil/UndefMacros.h
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
// SPDX-License-Identifier: GPL-3.0
/** @file UndefMacros.h
* @author Lefteris <lefteris@ethdev.com>
* @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