From 2c317a2585c9c1e03068a26f5a15e61ead6dfd4d Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Mon, 18 Dec 2017 11:51:28 -0800 Subject: [PATCH] [muparser] Remove muParserFixes.h This appears to be random pragmas for ICC only. --- fish.xcodeproj/project.pbxproj | 2 - muparser-2.2.5/Makefile.in | 1 - muparser-2.2.5/include/muParserDef.h | 2 - muparser-2.2.5/include/muParserFixes.h | 60 -------------------------- 4 files changed, 65 deletions(-) delete mode 100644 muparser-2.2.5/include/muParserFixes.h diff --git a/fish.xcodeproj/project.pbxproj b/fish.xcodeproj/project.pbxproj index 14ed2a76e..eb812e451 100644 --- a/fish.xcodeproj/project.pbxproj +++ b/fish.xcodeproj/project.pbxproj @@ -804,7 +804,6 @@ D06821FD1F51498700040321 /* muParserBytecode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserBytecode.h; sourceTree = ""; }; D06821FE1F51498700040321 /* muParserCallback.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserCallback.h; sourceTree = ""; }; D06821FF1F51498700040321 /* muParserDef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserDef.h; sourceTree = ""; }; - D06822021F51498700040321 /* muParserFixes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserFixes.h; sourceTree = ""; }; D06822031F51498700040321 /* muParserInt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserInt.h; sourceTree = ""; }; D06822061F51498700040321 /* muParserTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserTest.h; sourceTree = ""; }; D06822071F51498700040321 /* muParserToken.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = muParserToken.h; sourceTree = ""; }; @@ -1051,7 +1050,6 @@ D06821FD1F51498700040321 /* muParserBytecode.h */, D06821FE1F51498700040321 /* muParserCallback.h */, D06821FF1F51498700040321 /* muParserDef.h */, - D06822021F51498700040321 /* muParserFixes.h */, D06822031F51498700040321 /* muParserInt.h */, D06822061F51498700040321 /* muParserTest.h */, D06822071F51498700040321 /* muParserToken.h */, diff --git a/muparser-2.2.5/Makefile.in b/muparser-2.2.5/Makefile.in index 3cda158f4..712999ac9 100644 --- a/muparser-2.2.5/Makefile.in +++ b/muparser-2.2.5/Makefile.in @@ -59,7 +59,6 @@ MUPARSER_LIB_HEADERS = \ include/muParserBytecode.h \ include/muParserCallback.h \ include/muParserDef.h \ - include/muParserFixes.h \ include/muParserInt.h \ include/muParserTest.h \ include/muParserToken.h \ diff --git a/muparser-2.2.5/include/muParserDef.h b/muparser-2.2.5/include/muParserDef.h index 126616dc2..750c519b1 100644 --- a/muparser-2.2.5/include/muParserDef.h +++ b/muparser-2.2.5/include/muParserDef.h @@ -33,8 +33,6 @@ #include #include -#include "muParserFixes.h" - /** \file \brief This file contains standard definitions used by the parser. */ diff --git a/muparser-2.2.5/include/muParserFixes.h b/muparser-2.2.5/include/muParserFixes.h deleted file mode 100644 index 35bcdd80d..000000000 --- a/muparser-2.2.5/include/muParserFixes.h +++ /dev/null @@ -1,60 +0,0 @@ -/* - __________ - _____ __ __\______ \_____ _______ ______ ____ _______ - / \ | | \| ___/\__ \ \_ __ \/ ___/_/ __ \\_ __ \ - | Y Y \| | /| | / __ \_| | \/\___ \ \ ___/ | | \/ - |__|_| /|____/ |____| (____ /|__| /____ > \___ >|__| - \/ \/ \/ \/ - Copyright (C) 2013 Ingo Berg - - Permission is hereby granted, free of charge, to any person obtaining a copy of this - software and associated documentation files (the "Software"), to deal in the Software - without restriction, including without limitation the rights to use, copy, modify, - merge, publish, distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all copies or - substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT - NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ - -#ifndef MU_PARSER_FIXES_H -#define MU_PARSER_FIXES_H - -/** \file - \brief This file contains compatibility fixes for some platforms. -*/ - -// -// Compatibility fixes -// - -//--------------------------------------------------------------------------- -// -// Intel Compiler -// -//--------------------------------------------------------------------------- - -#ifdef __INTEL_COMPILER - -// remark #981: operands are evaluated in unspecified order -// disabled -> completely pointless if the functions do not have side effects -// -#pragma warning(disable : 981) - -// remark #383: value copied to temporary, reference to temporary used -#pragma warning(disable : 383) - -// remark #1572: floating-point equality and inequality comparisons are unreliable -// disabled -> everyone knows it, the parser passes this problem -// deliberately to the user -#pragma warning(disable : 1572) - -#endif - -#endif // include guard