mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 02:51:27 +00:00
Remove unused headers from hsStlUtils.h (and push them downstream where needed)
Also fix a couple of plString and header issues identified by Paradox on GCC/Clang
This commit is contained in:
@ -42,7 +42,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#ifndef plNetClientGroup_h
|
||||
#define plNetClientGroup_h
|
||||
|
||||
#include "hsStlUtils.h"
|
||||
#include <set>
|
||||
#include "pnNetCommon/plNetGroup.h"
|
||||
|
||||
//
|
||||
|
@ -43,7 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#define PL_NET_CLIENT_inc
|
||||
|
||||
#include "HeadSpin.h"
|
||||
#include "hsStlUtils.h"
|
||||
#include <list>
|
||||
|
||||
#include "plNetClientGroup.h"
|
||||
#include "plNetVoiceList.h"
|
||||
|
@ -39,6 +39,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
Mead, WA 99021
|
||||
|
||||
*==LICENSE==*/
|
||||
#include <cmath>
|
||||
|
||||
#include "plNetClientMgr.h"
|
||||
#include "plNetLinkingMgr.h"
|
||||
|
||||
|
@ -252,10 +252,10 @@ MSG_HANDLER_DEFN(plNetClientMsgHandler,plNetMsgSDLState)
|
||||
{
|
||||
std::string err;
|
||||
if (!sdRec)
|
||||
err = xtl::format( "SDL descriptor %s missing, v=%d", descName, ver);
|
||||
err = xtl::format( "SDL descriptor %s missing, v=%d", descName.c_str(), ver);
|
||||
else
|
||||
err = xtl::format( "SDL descriptor %s, version mismatch, server v=%d, client v=%d",
|
||||
descName, ver, sdRec->GetDescriptor()->GetVersion());
|
||||
descName.c_str(), ver, sdRec->GetDescriptor()->GetVersion());
|
||||
|
||||
hsAssert(false, err.c_str());
|
||||
nc->ErrorMsg(const_cast<char*>(err.c_str()));
|
||||
|
Reference in New Issue
Block a user