Fix "xtime: ambiguous symbol" errors w/ Visual Studio.

Quipyowert2 · stephanemagnenat · commit 9a1c29fd9e25 · 2023-04-24T09:17:49.000+02:00
diff --git a/libgag/src/TrueTypeFont.cpp b/libgag/src/TrueTypeFont.cpp
@@ -28,7 +28,6 @@
 #include <fribidi/fribidi.h>
 #endif
 
-using namespace std;
 #define MAX_CACHE_SIZE 128
 
 namespace GAGCore
diff --git a/libusl/src/code.cpp b/libusl/src/code.cpp
@@ -8,7 +8,8 @@
 
 #include <sstream>
 
-using namespace std;
+using std::ostringstream;
+using std::string;
 
 ThunkPrototype* thisMember(Prototype* outer)
 {
diff --git a/libusl/src/debug.cpp b/libusl/src/debug.cpp
@@ -3,7 +3,7 @@
 #include "code.h"
 #include "native.h"
 
-using namespace std;
+using std::string;
 
 const Position& ThunkDebugInfo::find(size_t address) const
 {
diff --git a/libusl/src/interpreter.cpp b/libusl/src/interpreter.cpp
@@ -6,7 +6,7 @@
 
 #include <iostream>
 
-using namespace std;
+using std::for_each;
 
 bool Thread::step()
 {
@@ -81,16 +81,12 @@ size_t Thread::run()
 
 void Thread::markForGC()
 {
-	using namespace std;
-
 	// mark all frames in stack
 	for_each(frames.begin(), frames.end(), [](auto& frame) {frame.markForGC(); });
 }
 
 void Thread::Frame::markForGC()
 {
-	using namespace std;
-	
 	// mark all variables in frame
 	for_each(stack.begin(), stack.end(), [](auto& value) {value->markForGC(); });
 	thunk->markForGC();
diff --git a/libusl/src/lexer.cpp b/libusl/src/lexer.cpp
@@ -4,7 +4,9 @@
 #include <cassert>
 #include <sstream>
 
-using namespace std;
+using std::ostringstream;
+using std::string;
+using std::endl;
 
 const Token::Type Lexer::tokenTypes[] =
 {
diff --git a/libusl/src/memory.cpp b/libusl/src/memory.cpp
@@ -2,7 +2,8 @@
 #include "interpreter.h"
 #include "types.h"
 
-using namespace std;
+using std::for_each;
+using std::mem_fun;
 
 void Heap::collectGarbage()
 {
diff --git a/libusl/src/parser.cpp b/libusl/src/parser.cpp
@@ -3,7 +3,8 @@
 #include "error.h"
 #include <memory>
 
-using namespace std;
+using std::string;
+using std::unique_ptr;
 
 void Parser::parse(BlockNode* block)
 {
diff --git a/libusl/src/tree.cpp b/libusl/src/tree.cpp
@@ -5,7 +5,9 @@
 #include "types.h"
 #include <sstream>
 
-using namespace std;
+using std::stringstream;
+using std::ostringstream;
+using std::endl;
 
 
 void Node::generate(ThunkPrototype* thunk, DebugInfo* debug, Code* code)
diff --git a/libusl/src/types.cpp b/libusl/src/types.cpp
@@ -9,7 +9,6 @@
 #include <cassert>
 #include <algorithm>
 
-using namespace std;
 
 void Value::dump(std::ostream &stream) const
 {
diff --git a/libusl/src/types.h b/libusl/src/types.h
@@ -65,13 +65,15 @@ struct Prototype: Value
 	virtual void dumpSpecific(std::ostream& stream) const
 	{
 		stream << ": ";
-		using namespace std;
+		using std::transform;
+		using std::ostream_iterator;
+		using std::string;
 		transform(members.begin(), members.end(), ostream_iterator<string>(stream, " "), [](auto& member) {return member.first; });
 	}
 	
 	virtual void propagateMarkForGC()
 	{
-		using namespace std;
+		using std::for_each;
 		for_each(members.begin(), members.end(), [this](auto& member) {dynamic_cast<Value*>(member.second)->markForGC(); });
 	}
 	
@@ -157,7 +159,8 @@ struct Scope: Thunk
 	
 	virtual void propagateMarkForGC()
 	{
-		using namespace std;
+		using std::for_each;
+		using std::mem_fun;
 		for_each(locals.begin(), locals.end(), mem_fun(&Value::markForGC));
 	}
 	
diff --git a/libusl/src/usl.cpp b/libusl/src/usl.cpp
@@ -8,7 +8,12 @@
 #include <fstream>
 #include <memory>
 
-using namespace std;
+using std::ostream;
+using std::ifstream;
+using std::string;
+using std::unique_ptr;
+using std::cout;
+using std::endl;
 
 void dumpCode(ThunkPrototype* thunk, ThunkDebugInfo* debug, ostream& stream)
 {
diff --git a/src/AI.cpp b/src/AI.cpp
@@ -35,7 +35,7 @@
 #include "AINicowar.h"
 #include "AIEcho.h"
 
-using namespace boost;
+using boost::shared_ptr;
 
 /*AI::AI(Player *player)
 {
diff --git a/src/AICastor.cpp b/src/AICastor.cpp
@@ -34,7 +34,7 @@
 #define AI_FILE_MIN_VERSION 1
 #define AI_FILE_VERSION 2
 
-using namespace boost;
+using boost::shared_ptr;
 
 // AICastor::Project part:
 
diff --git a/src/AIEcho.cpp b/src/AIEcho.cpp
@@ -40,7 +40,7 @@ using namespace AIEcho::Management;
 using namespace AIEcho::Conditions;
 using namespace AIEcho::SearchTools;
 using namespace boost::logic;
-using namespace boost;
+using boost::shared_ptr;
 
 
 
diff --git a/src/AINumbi.cpp b/src/AINumbi.cpp
@@ -27,7 +27,7 @@
 #include "Utilities.h"
 #include "Unit.h"
 
-using namespace boost;
+using boost::shared_ptr;
 
 AINumbi::AINumbi(Player *player)
 {
diff --git a/src/AIToubib.cpp b/src/AIToubib.cpp
@@ -25,7 +25,7 @@
 #include "Order.h"
 #include "Player.h"
 
-using namespace boost;
+using boost::shared_ptr;
 
 AIToubib::AIToubib(Player *player)
 {
diff --git a/src/AIWarrush.cpp b/src/AIWarrush.cpp
@@ -34,7 +34,7 @@
 #define BUILDING_DELAY 30
 #define AREAS_DELAY 50
 
-using namespace boost;
+using boost::shared_ptr;
 
 void AIWarrush::init(Player *player)
 {
diff --git a/src/Engine.cpp b/src/Engine.cpp
@@ -44,7 +44,6 @@
 
 #include <iostream>
 
-using namespace boost;
 
 Engine::Engine()
 {
diff --git a/src/Engine.h b/src/Engine.h
@@ -36,6 +36,8 @@
 class MultiplayersJoin;
 class NetGame;
 
+using boost::shared_ptr;
+
 /// Engine is the backend of the game. It is responsible for loading and setting up games and players,
 /// and its run function is meant to run the game that has been loaded.
 class Engine
diff --git a/src/FertilityCalculatorDialog.cpp b/src/FertilityCalculatorDialog.cpp
@@ -29,7 +29,7 @@
 
 using namespace GAGCore;
 using namespace GAGGUI;
-using namespace boost;
+using boost::static_pointer_cast;
 
 FertilityCalculatorDialog::FertilityCalculatorDialog(GraphicContext *parentCtx, Map& map)
 	: OverlayScreen(parentCtx, 200, 100), map(map), parentCtx(parentCtx), thread(map, incoming, incomingMutex)
diff --git a/src/GameGUI.cpp b/src/GameGUI.cpp
@@ -128,7 +128,8 @@
 #define REPLAY_BAR_FAST_FORWARD_BUTTON_SPRITE 55
 #define REPLAY_BAR_FAST_FORWARD_BUTTON_ACTIVE_SPRITE 54
 
-using namespace boost;
+using boost::shared_ptr;
+using boost::static_pointer_cast;
 
 enum GameGUIGfxId
 {
diff --git a/src/Glob2.cpp b/src/Glob2.cpp
@@ -70,6 +70,8 @@
 #	include <sys/param.h>
 #endif
 
+using boost::shared_ptr;
+
 /*!	\mainpage Globulation 2 Reference documentation
 
 	\section intro Introduction
diff --git a/src/IRCTextMessageHandler.cpp b/src/IRCTextMessageHandler.cpp
@@ -26,7 +26,7 @@
 #include "YOGConsts.h"
 
 using namespace GAGCore;
-using namespace boost;
+using boost::static_pointer_cast;
 
 IRCTextMessageHandler::IRCTextMessageHandler()
 	: irc(incoming, incomingMutex)
diff --git a/src/IRCThread.cpp b/src/IRCThread.cpp
@@ -20,7 +20,7 @@
 #include "IRCThreadMessage.h"
 #include <iostream>
 
-using namespace boost;
+using boost::static_pointer_cast;
 
 IRCThread::IRCThread(std::queue<boost::shared_ptr<IRCThreadMessage> >& outgoing, boost::recursive_mutex& outgoingMutex)
 	: outgoing(outgoing), outgoingMutex(outgoingMutex)
diff --git a/src/LANFindScreen.cpp b/src/LANFindScreen.cpp
@@ -34,6 +34,7 @@
 #include "YOGClientGameListManager.h"
 
 using namespace GAGGUI;
+using boost::shared_ptr;
 
 LANFindScreen::LANFindScreen()
 {
diff --git a/src/LANMenuScreen.cpp b/src/LANMenuScreen.cpp
@@ -33,6 +33,8 @@
 #include <Toolkit.h>
 #include "YOGServer.h"
 
+using boost::shared_ptr;
+
 LANMenuScreen::LANMenuScreen()
 {
 	addWidget(new TextButton(0,  70, 300, 40, ALIGN_CENTERED, ALIGN_SCREEN_CENTERED, "menu", Toolkit::getStringTable()->getString("[host]"), HOST));
diff --git a/src/MapScriptUSL.cpp b/src/MapScriptUSL.cpp
@@ -33,7 +33,12 @@ using namespace GAGCore;
 #include <memory>
 #include <boost/functional.hpp>
 
-using namespace std;
+using std::string;
+using std::unique_ptr;
+using std::ifstream;
+using std::istringstream;
+using std::cerr;
+using std::endl;
 
 
 template<>
diff --git a/src/MultiplayerGame.cpp b/src/MultiplayerGame.cpp
@@ -26,6 +26,9 @@
 #include "NetMessage.h"
 #include "YOGClientGameListManager.h"
 
+using boost::shared_ptr;
+using boost::static_pointer_cast;
+
 MultiplayerGame::MultiplayerGame(boost::shared_ptr<YOGClient> client)
 	: client(client), creationState(YOGCreateRefusalUnknown), joinState(YOGJoinRefusalUnknown), playerManager(gameHeader)
 {
diff --git a/src/MultiplayerGameScreen.cpp b/src/MultiplayerGameScreen.cpp
@@ -40,6 +40,8 @@
 #include "YOGMessage.h"
 #include "CustomGameOtherOptions.h"
 
+using boost::static_pointer_cast;
+
 MultiplayerGameScreen::MultiplayerGameScreen(TabScreen* parent, boost::shared_ptr<MultiplayerGame> game, boost::shared_ptr<YOGClient> client, boost::shared_ptr<IRCTextMessageHandler> ircChat)
 	: TabScreenWindow(parent, Toolkit::getStringTable()->getString("[Game]")), game(game), gameChat(new YOGClientChatChannel(static_cast<unsigned int>(-1), client)), ircChat(ircChat)
 {
diff --git a/src/NetConnection.cpp b/src/NetConnection.cpp
@@ -24,6 +24,8 @@
 #include "NetMessage.h"
 
 using namespace GAGCore;
+using boost::static_pointer_cast;
+using boost::shared_ptr;
 
 
 	
diff --git a/src/NetConnection.h b/src/NetConnection.h
@@ -24,7 +24,7 @@
 #include <queue>
 #include <boost/shared_ptr.hpp>
 
-using namespace boost;
+using boost::shared_ptr;
 
 class NetListener;
 class NetMessage;
diff --git a/src/NetConnectionThread.cpp b/src/NetConnectionThread.cpp
@@ -23,6 +23,7 @@
 #include "boost/lexical_cast.hpp"
 
 using namespace GAGCore;
+using boost::static_pointer_cast;
 
 NetConnectionThread::NetConnectionThread(std::queue<boost::shared_ptr<NetConnectionThreadMessage> >& outgoing, boost::recursive_mutex& outgoingMutex)
 	: outgoing(outgoing),  outgoingMutex(outgoingMutex)
diff --git a/src/NetListener.h b/src/NetListener.h
@@ -22,7 +22,6 @@
 #include "SDL_net.h"
 #include "NetConnection.h"
 
-using namespace boost;
 
 ///NetListener represents a low level wrapper arround SDL.
 ///It listens for incoming connections. One should frequently
diff --git a/src/NetMessage.h b/src/NetMessage.h
@@ -37,7 +37,7 @@
 #include "YOGAfterJoinGameInformation.h"
 
 
-using namespace boost;
+using boost::shared_ptr;
 
 ///This is the enum of message types
 enum NetMessageType
diff --git a/src/NetTestSuite.cpp b/src/NetTestSuite.cpp
@@ -25,6 +25,7 @@
 
 
 using namespace GAGCore;
+using boost::shared_ptr;
 
 NetTestSuite::NetTestSuite()
 {
diff --git a/src/NetTestSuite.h b/src/NetTestSuite.h
@@ -26,8 +26,6 @@
 #include "YOGMessage.h"
 #include <boost/shared_ptr.hpp>
 
-using namespace boost;
-
 ///This is a basic test system for the low level net classes,
 ///NetConnection, NetListener, NetMessage, YOGGameInfo and YOGMessage
 ///When run, it is assumed that the host allows the program to listen on
diff --git a/src/SGSL.cpp b/src/SGSL.cpp
@@ -41,6 +41,9 @@
 #include "Unit.h"
 #include "Utilities.h"
 
+using std::string;
+using std::cerr;
+using std::endl;
 
 SGSLToken::TokenSymbolLookupTable SGSLToken::table[] =
 {
@@ -1090,7 +1093,6 @@ void Story::syncStep(GameGUI *gui)
 		std::cout << "Story::syncStep : SGSL : Warning, story step took more than 256 cycles, perhaps you have infinite loop in your script" << std::endl;
 }
 
-using namespace std;
 
 std::string ErrorReport::getErrorString(void) const
 {
diff --git a/src/YOGClient.cpp b/src/YOGClient.cpp
@@ -34,6 +34,9 @@
 #include "YOGMessage.h"
 #include "YOGServer.h"
 
+using boost::static_pointer_cast;
+using boost::shared_ptr;
+
 YOGClient::YOGClient(const std::string& server)
 {
 	initialize();
diff --git a/src/YOGClientDownloadableMapList.cpp b/src/YOGClientDownloadableMapList.cpp
diff --git a/src/YOGClientFileAssembler.cpp b/src/YOGClientFileAssembler.cpp
diff --git a/src/YOGClientGameConnectionDialog.cpp b/src/YOGClientGameConnectionDialog.cpp
diff --git a/src/YOGClientGameListManager.cpp b/src/YOGClientGameListManager.cpp
diff --git a/src/YOGClientMapUploader.cpp b/src/YOGClientMapUploader.cpp
diff --git a/src/YOGClientPlayerListManager.cpp b/src/YOGClientPlayerListManager.cpp
diff --git a/src/YOGClientRouterAdministrator.cpp b/src/YOGClientRouterAdministrator.cpp
diff --git a/src/YOGLoginScreen.cpp b/src/YOGLoginScreen.cpp
diff --git a/src/YOGRegisterScreen.cpp b/src/YOGRegisterScreen.cpp
diff --git a/src/YOGServerFileDistributor.cpp b/src/YOGServerFileDistributor.cpp
diff --git a/src/YOGServerPlayer.cpp b/src/YOGServerPlayer.cpp
diff --git a/src/YOGServerPlayer.h b/src/YOGServerPlayer.h
diff --git a/src/YOGServerRouter.cpp b/src/YOGServerRouter.cpp
diff --git a/src/YOGServerRouterManager.cpp b/src/YOGServerRouterManager.cpp
diff --git a/src/YOGServerRouterPlayer.cpp b/src/YOGServerRouterPlayer.cpp

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@`
`8`	`8`
`9`	`9`	`#include <sstream>`
`10`	`10`
`11`		`-using namespace std;`
	`11`	`+using std::ostringstream;`
	`12`	`+using std::string;`
`12`	`13`
`13`	`14`	`ThunkPrototype* thisMember(Prototype* outer)`
`14`	`15`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include "code.h"`
`4`	`4`	`#include "native.h"`
`5`	`5`
`6`		`-using namespace std;`
	`6`	`+using std::string;`
`7`	`7`
`8`	`8`	`const Position& ThunkDebugInfo::find(size_t address) const`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`#include <iostream>`
`8`	`8`
`9`		`-using namespace std;`
	`9`	`+using std::for_each;`
`10`	`10`
`11`	`11`	`bool Thread::step()`
`12`	`12`	`{`
`@@ -81,16 +81,12 @@ size_t Thread::run()`
`81`	`81`
`82`	`82`	`void Thread::markForGC()`
`83`	`83`	`{`
`84`		`- using namespace std;`
`85`		`-`
`86`	`84`	`// mark all frames in stack`
`87`	`85`	`for_each(frames.begin(), frames.end(), [](auto& frame) {frame.markForGC(); });`
`88`	`86`	`}`
`89`	`87`
`90`	`88`	`void Thread::Frame::markForGC()`
`91`	`89`	`{`
`92`		`- using namespace std;`
`93`		`-`
`94`	`90`	`// mark all variables in frame`
`95`	`91`	`for_each(stack.begin(), stack.end(), [](auto& value) {value->markForGC(); });`
`96`	`92`	`thunk->markForGC();`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,9 @@`
`4`	`4`	`#include <cassert>`
`5`	`5`	`#include <sstream>`
`6`	`6`
`7`		`-using namespace std;`
	`7`	`+using std::ostringstream;`
	`8`	`+using std::string;`
	`9`	`+using std::endl;`
`8`	`10`
`9`	`11`	`const Token::Type Lexer::tokenTypes[] =`
`10`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`#include "interpreter.h"`
`3`	`3`	`#include "types.h"`
`4`	`4`
`5`		`-using namespace std;`
	`5`	`+using std::for_each;`
	`6`	`+using std::mem_fun;`
`6`	`7`
`7`	`8`	`void Heap::collectGarbage()`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,8 @@`
`3`	`3`	`#include "error.h"`
`4`	`4`	`#include <memory>`
`5`	`5`
`6`		`-using namespace std;`
	`6`	`+using std::string;`
	`7`	`+using std::unique_ptr;`
`7`	`8`
`8`	`9`	`void Parser::parse(BlockNode* block)`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`#include <cassert>`
`10`	`10`	`#include <algorithm>`
`11`	`11`
`12`		`-using namespace std;`
`13`	`12`
`14`	`13`	`void Value::dump(std::ostream &stream) const`
`15`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,13 +65,15 @@ struct Prototype: Value`
`65`	`65`	`virtual void dumpSpecific(std::ostream& stream) const`
`66`	`66`	`{`
`67`	`67`	`stream << ": ";`
`68`		`- using namespace std;`
	`68`	`+ using std::transform;`
	`69`	`+ using std::ostream_iterator;`
	`70`	`+ using std::string;`
`69`	`71`	`transform(members.begin(), members.end(), ostream_iterator<string>(stream, " "), [](auto& member) {return member.first; });`
`70`	`72`	`}`
`71`	`73`
`72`	`74`	`virtual void propagateMarkForGC()`
`73`	`75`	`{`
`74`		`- using namespace std;`
	`76`	`+ using std::for_each;`
`75`	`77`	`for_each(members.begin(), members.end(), [this](auto& member) {dynamic_cast<Value*>(member.second)->markForGC(); });`
`76`	`78`	`}`
`77`	`79`
`@@ -157,7 +159,8 @@ struct Scope: Thunk`
`157`	`159`
`158`	`160`	`virtual void propagateMarkForGC()`
`159`	`161`	`{`
`160`		`- using namespace std;`
	`162`	`+ using std::for_each;`
	`163`	`+ using std::mem_fun;`
`161`	`164`	`for_each(locals.begin(), locals.end(), mem_fun(&Value::markForGC));`
`162`	`165`	`}`
`163`	`166`