mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2024-11-10 07:11:54 +00:00
8aeff6b09a
The STL now defines `std::byte` so doing `using namespace std`
will conflict will custom definition of `byte`, which this
legacy code is full of.
It looks like NetRadiant went the route of making explicit
usage of `std::` prefixed types and did not renamed the
custom definition of byte, so doing the same reduces diff
noise between the two trees.
This also makes the code future proof if the STL decides
to define some other types with common name.
This patches replaces all usages of `map`, `pair` and
`vector` with `std::map`, `std::pair` and `std::vector`
and remove the `using namespace std` line in `stl_check.h`.
```
libs/mathlib.h:132:44: error: reference to ‘byte’ is ambiguous
132 | void NormalToLatLong( const vec3_t normal, byte bytes[2] );
| ^~~~
In file included from /usr/include/c++/11/bits/stl_algobase.h:61,
from /usr/include/c++/11/bits/char_traits.h:39,
from /usr/include/c++/11/ios:40,
from /usr/include/c++/11/ostream:38,
from /usr/include/c++/11/iostream:39,
from libs/missing.h:76,
from radiant/qe3.h:40,
from radiant/stdafx.h:39,
from radiant/bp_dlg.cpp:28:
/usr/include/c++/11/bits/cpp_type_traits.h:404:30: note: candidates are: ‘enum class std::byte’
404 | enum class byte : unsigned char;
| ^~~~
```
60 lines
1.8 KiB
C
60 lines
1.8 KiB
C
/*
|
|
Copyright (C) 1999-2007 id Software, Inc. and contributors.
|
|
For a list of contributors, see the accompanying CONTRIBUTORS file.
|
|
|
|
This file is part of GtkRadiant.
|
|
|
|
GtkRadiant 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.
|
|
|
|
GtkRadiant 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 GtkRadiant; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
/*!
|
|
This header is used to make sure the STL we are using is what we expect
|
|
this allows to catch some weird errors early at compile time
|
|
*/
|
|
|
|
// TODO: finish complete cleanup and removal of STLPort usage traces
|
|
#ifndef Q_NO_STLPORT
|
|
#define Q_NO_STLPORT
|
|
#endif
|
|
|
|
#ifndef Q_NO_STLPORT
|
|
|
|
#ifndef _STLPORT_VERSION
|
|
#error "Can't find _STLPORT_VERSION, check you are compiling against STLPort"
|
|
#endif
|
|
|
|
#if !defined( _STLP_DONT_USE_EXCEPTIONS )
|
|
#error exc
|
|
#endif
|
|
|
|
#if !defined( _STLP_NO_NAMESPACES )
|
|
#error namespace
|
|
#endif
|
|
|
|
#if !defined( _STLP_NO_IOSTREAMS )
|
|
#error io
|
|
#endif
|
|
|
|
// now check a few more things (paranoid)
|
|
// if you use our custom STLPort distribution it should be alright though
|
|
#if !defined( _STLP_DONT_USE_EXCEPTIONS ) || !defined( _STLP_NO_NAMESPACES ) || !defined( _STLP_NO_IOSTREAMS )
|
|
#error "There is something broken in your STLPort config"
|
|
#endif
|
|
|
|
#ifdef _WIN32
|
|
#pragma warning(disable : 4786)
|
|
#endif
|
|
|
|
#endif
|