From 5512eb6a14499fc1646d93f021d180317870e985 Mon Sep 17 00:00:00 2001
From: Jyrki Vesterinen <sandgtx@gmail.com>
Date: Thu, 6 Sep 2018 19:13:16 +0300
Subject: [PATCH] Fix build with Visual Studio 2013

Regression from commit 3826c263b1ac203c5487c1a81000c3111bda263b.
---
 src/color.hpp        | 4 +++-
 src/map/location.hpp | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/color.hpp b/src/color.hpp
index a10985c17077..0877f7d1c158 100644
--- a/src/color.hpp
+++ b/src/color.hpp
@@ -13,6 +13,8 @@
 
 #pragma once
 
+#include "global.hpp"
+
 #include <algorithm> // for max
 #include <cstdint>
 #include <ostream>
@@ -250,7 +252,7 @@ namespace std
 	template<>
 	struct hash<color_t>
 	{
-		size_t operator()(const color_t& c) const noexcept
+		size_t operator()(const color_t& c) const NOEXCEPT
 		{
 			return c.to_rgba_bytes();
 		}
diff --git a/src/map/location.hpp b/src/map/location.hpp
index ff4066ae06cb..63a15d5e43ab 100644
--- a/src/map/location.hpp
+++ b/src/map/location.hpp
@@ -19,6 +19,8 @@
 class config;
 class variable_set;
 
+#include "global.hpp"
+
 #include <array>
 #include <cmath>
 #include <cstdlib>
@@ -210,7 +212,7 @@ std::ostream &operator<<(std::ostream &s, const std::vector<map_location>& v);
 namespace std {
 template<>
 struct hash<map_location> {
-	size_t operator()(const map_location& l) const noexcept {
+	size_t operator()(const map_location& l) const NOEXCEPT {
 		// The 2000 bias supposedly ensures that the correct x is recovered for negative y
 		// This implementation copied from the Lua location_set
 		return (l.wml_x()) * 16384 + (l.wml_y()) + 2000;