mirror of
https://github.com/TTimo/GtkRadiant.git
synced 2024-11-14 00:41:08 +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;
| ^~~~
```
48 lines
1.8 KiB
C++
48 lines
1.8 KiB
C++
/*
|
|
BobToolz plugin for GtkRadiant
|
|
Copyright (C) 2001 Gordon Biggans
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
vec_t Min( vec_t a, vec_t b );
|
|
|
|
epair_t* GetNextChainItem( epair_t* lastItem, const char* key, const char* value );
|
|
|
|
// reads current texture into global, returns pointer to it
|
|
const char* GetCurrentTexture();
|
|
|
|
void FillDefaultTexture( _QERFaceData* faceData, vec3_t va, vec3_t vb, vec3_t vc, const char* texture );
|
|
|
|
void Sys_ERROR( const char* text, ... );
|
|
|
|
void BuildMiniPrt( std::list<Str>* exclusionList );
|
|
|
|
void MoveBlock( int dir, vec3_t min, vec3_t max, float dist );
|
|
void SetInitialStairPos( int dir, vec3_t min, vec3_t max, float width );
|
|
|
|
entity_s* FindEntityFromTargetname( const char* targetname, int* entNum );
|
|
|
|
char* UnixToDosPath( char* path );
|
|
|
|
char* GetFilename( char* buffer, const char* filename );
|
|
char* GetGameFilename( char* buffer, const char* filename );
|
|
|
|
float Determinant3x3( float a1, float a2, float a3,
|
|
float b1, float b2, float b3,
|
|
float c1, float c2, float c3 );
|
|
|
|
bool GetEntityCentre( const char* entity, vec3_t centre );
|
|
void MakeNormal( vec_t* va, vec_t* vb, vec_t* vc, vec_t* out );
|