-
-
Notifications
You must be signed in to change notification settings - Fork 988
/
wesnoth_fix_vc12_build.patch
38 lines (34 loc) · 1.36 KB
/
wesnoth_fix_vc12_build.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 82280e166a05c13e3d370c397a55d5f4b049bfa7 Mon Sep 17 00:00:00 2001
From: Jyrki Vesterinen <sandgtx@gmail.com>
Date: Tue, 22 Nov 2016 21:26:47 +0200
Subject: [PATCH] Fix build with Visual Studio 2013
---
src/spirit_po/catalog.hpp | 2 +-
src/spirit_po/catalog_metadata.hpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/spirit_po/catalog.hpp b/src/spirit_po/catalog.hpp
index a9b154d..271d080 100644
--- a/src/spirit_po/catalog.hpp
+++ b/src/spirit_po/catalog.hpp
@@ -49,7 +49,7 @@ class catalog {
hashmap_type hashmap_;
public:
- static constexpr char EOT = static_cast<char>(4);
+ static const char EOT = '\x4';
// ASCII 4 is EOT character
// Used to separate msg context from msgid in the hashmap, in MO files
// We use the same formatting system, just for consistency.
diff --git a/src/spirit_po/catalog_metadata.hpp b/src/spirit_po/catalog_metadata.hpp
index 1ff2439..d2f02c0 100644
--- a/src/spirit_po/catalog_metadata.hpp
+++ b/src/spirit_po/catalog_metadata.hpp
@@ -82,7 +82,7 @@ private:
public:
// nonempty return is an error message
std::string parse_header(const std::string & header) {
- constexpr const char * default_charset = DEFAULT_CHARSET;
+ const char * default_charset = DEFAULT_CHARSET;
#undef DEFAULT_CHARSET
project_id = find_header_line(header, "Project-Id-Version:");
--
2.10.1.windows.1