Differential D3129 Diff 14164 source/network/NetServer.h

Changeset View

Standalone View

source/network/NetServer.h

Show All 18 Lines
#define NETSERVER_H		#define NETSERVER_H

#include "NetFileTransfer.h"		#include "NetFileTransfer.h"
#include "NetHost.h"		#include "NetHost.h"
#include "lib/config2.h"		#include "lib/config2.h"
#include "lib/types.h"		#include "lib/types.h"
#include "scriptinterface/ScriptTypes.h"		#include "scriptinterface/ScriptTypes.h"

		#include <ctime>
#include <mutex>		#include <mutex>
#include <string>		#include <string>
#include <utility>		#include <utility>
#include <vector>		#include <vector>
#include <thread>		#include <thread>

class CNetServerSession;		class CNetServerSession;
class CNetServerTurnManager;		class CNetServerTurnManager;
▲ Show 20 Lines • Show All 311 Lines • ▼ Show 20 Lines	private:
* The latest copy of the simulation state, received from an existing		* The latest copy of the simulation state, received from an existing
* client when a new client has asked to rejoin the game.		* client when a new client has asked to rejoin the game.
*/		*/
std::string m_JoinSyncFile;		std::string m_JoinSyncFile;

/**		/**
* Time when the clients connections were last checked for timeouts and latency.		* Time when the clients connections were last checked for timeouts and latency.
*/		*/
std::time_t m_LastConnectionCheck;		std::time_t m_LastConnectionCheck;
		SilierUnsubmitted Not Done Inline Actions something broke, from jenkins windows network\NetServer.h(354): error C2039: 'time_t': is not a member of 'std' (compiling source file ..\..\..\source\network\NetServer.cpp) Silier: something broke, from jenkins windows ``` network\NetServer.h(354): error C2039: 'time_t': is…
		wraitiiAuthorUnsubmitted Done Inline Actions Fixed in the latest diff. I needed to include <ctime> wraitii: Fixed in the latest diff. I needed to include <ctime>

private:		private:
// Thread-related stuff:		// Thread-related stuff:

#if CONFIG2_MINIUPNPC		#if CONFIG2_MINIUPNPC
/**		/**
* Try to find a UPnP root on the network and setup port forwarding.		* Try to find a UPnP root on the network and setup port forwarding.
*/		*/
Show All 25 Lines