[Scummvm-git-logs] scummvm master -> f0af2b513be5971416f8e2b01b139aad9fa9852b

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
f0af2b513b COMMON: Remove c++11-compat.h. It is not needed anymore


Commit: f0af2b513be5971416f8e2b01b139aad9fa9852b
    https://github.com/scummvm/scummvm/commit/f0af2b513be5971416f8e2b01b139aad9fa9852b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-31T23:07:36+02:00

Commit Message:
COMMON: Remove c++11-compat.h. It is not needed anymore

Changed paths:
  R common/c++11-compat.h
    common/scummsys.h


diff --git a/common/c++11-compat.h b/common/c++11-compat.h
deleted file mode 100644
index 5a981493ff..0000000000
--- a/common/c++11-compat.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef COMMON_CPP11_COMPAT_H
-#define COMMON_CPP11_COMPAT_H
-
-#if __cplusplus >= 201103L
-#error "c++11-compat.h included when C++11 is available"
-#endif
-
-//
-// Custom nullptr replacement. This is not type safe as the real C++11 nullptr
-// though.
-//
-#if !defined(nullptr)  // XCode 5.0.1 has __cplusplus=199711 but defines this
-// MSVC 2010 and newer fully support nullptr: http://msdn.microsoft.com/en-us/library/hh567368.aspx
-#if !defined(_MSC_VER) || _MSC_VER < 1600
-#define nullptr 0
-#endif
-#endif
-
-//
-// Replacement for the override & final keywords. This allows compilation of
-// code which uses it, but does not feature any semantic.
-//
-// MSVC 2012 and newer fully support these: http://msdn.microsoft.com/en-us/library/hh567368.aspx
-#if !defined(_MSC_VER) || _MSC_VER < 1700
-#define override
-#define final
-#endif
-
-#endif
diff --git a/common/scummsys.h b/common/scummsys.h
index bc2a20e176..6ecad72e33 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -225,11 +225,6 @@
 	#define M_SQRT1_2 0.70710678118654752440 /* 1/sqrt(2) */
 #endif
 
-// Include our C++11 compatability header for pre-C++11 compilers.
-#if __cplusplus < 201103L
-#include "common/c++11-compat.h"
-#endif
-
 // Use config.h, generated by configure
 #if defined(HAVE_CONFIG_H)
 #include "config.h"