Permalink
Browse files

Merge pull request #986 from smcv/gcc8

JK2: Remove mismatched allocator from std::map typedefs
  • Loading branch information...
xycaleth committed Sep 17, 2018
2 parents ddb2be1 + c19f5c3 commit cc4094c8fa989663eb8087b33d97bb2749295b9f
Showing with 6 additions and 5 deletions.
  1. +1 −1 codeJK2/cgame/cg_main.cpp
  2. +2 −2 codeJK2/game/g_local.h
  3. +1 −1 codeJK2/game/g_spawn.cpp
  4. +2 −1 scripts/travis/install.sh
@@ -31,7 +31,7 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
#include "../code/qcommon/ojk_saved_game_helper.h"
//NOTENOTE: Be sure to change the mirrored code in g_shared.h
typedef std::map< sstring_t, unsigned char, std::less<sstring_t>, std::allocator< unsigned char > > namePrecache_m;
typedef std::map< sstring_t, unsigned char, std::less<sstring_t> > namePrecache_m;
extern namePrecache_m *as_preCacheMap;
extern void CG_RegisterNPCCustomSounds( clientInfo_t *ci );
extern qboolean G_AddSexToMunroString ( char *string, qboolean qDoBoth );
View
@@ -634,8 +634,8 @@ typedef struct pscript_s
long length;
} pscript_t;
typedef std::map < std::string, int, std::less<std::string>, std::allocator<int> > entlist_t;
typedef std::map < std::string, pscript_t*, std::less<std::string>, std::allocator<pscript_t*> > bufferlist_t;
typedef std::map < std::string, int, std::less<std::string> > entlist_t;
typedef std::map < std::string, pscript_t*, std::less<std::string> > bufferlist_t;
extern char *G_NewString( const char *string );
View
@@ -39,7 +39,7 @@ char spawnVarChars[MAX_SPAWN_VARS_CHARS];
#include "../../code/qcommon/sstring.h"
//NOTENOTE: Be sure to change the mirrored code in cgmain.cpp
typedef std::map< sstring_t, unsigned char, std::less<sstring_t>, std::allocator< unsigned char > > namePrecache_m;
typedef std::map< sstring_t, unsigned char, std::less<sstring_t> > namePrecache_m;
namePrecache_m *as_preCacheMap;
qboolean G_SpawnString( const char *key, const char *defaultString, char **out ) {
@@ -8,7 +8,8 @@ shift 1
# macOS is special
if [ "${TRAVIS_OS_NAME}" = "osx" ]; then
brew install libpng sdl2 --universal
brew upgrade
brew install --universal --verbose libpng sdl2
exit 0
fi

0 comments on commit cc4094c

Please sign in to comment.