summaryrefslogtreecommitdiffhomepage
path: root/StarsEx
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-04-07 00:35:59 +0200
committerAki <please@ignore.pl>2022-04-07 00:35:59 +0200
commit6466c06e44684952dd28cd5a6ac3968bdb81646e (patch)
tree13c85cd91a89b761b2b66eac4da11c4c6df3556d /StarsEx
parent39f7f892fe4f995bb354ab2a87d46c5c04a9fd25 (diff)
downloadstarshatter-6466c06e44684952dd28cd5a6ac3968bdb81646e.zip
starshatter-6466c06e44684952dd28cd5a6ac3968bdb81646e.tar.gz
starshatter-6466c06e44684952dd28cd5a6ac3968bdb81646e.tar.bz2
Changed file names for Parser to avoid conflict in MSVC environment
Diffstat (limited to 'StarsEx')
-rw-r--r--StarsEx/ParseUtil.h2
-rw-r--r--StarsEx/Ship.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/StarsEx/ParseUtil.h b/StarsEx/ParseUtil.h
index c234d00..43ddab3 100644
--- a/StarsEx/ParseUtil.h
+++ b/StarsEx/ParseUtil.h
@@ -20,7 +20,7 @@
#include "Color.h"
#include "Text.h"
-#include "Parser.h"
+#include "Parser_ss.h"
#include "Reader.h"
#include "Token.h"
diff --git a/StarsEx/Ship.cpp b/StarsEx/Ship.cpp
index 531f99f..921bc58 100644
--- a/StarsEx/Ship.cpp
+++ b/StarsEx/Ship.cpp
@@ -85,7 +85,7 @@
#include "DataLoader.h"
#include "Panic.h"
-#include "Parser.h"
+#include "Parser_ss.h"
#include "Reader.h"
// +----------------------------------------------------------------------+