Skip to content

Commit

Permalink
Fix build with Visual Studio 2013
Browse files Browse the repository at this point in the history
Regression from commit 3826c26.
  • Loading branch information
jyrkive committed Sep 6, 2018
1 parent ca6e7ae commit 5512eb6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/color.hpp
Expand Up @@ -13,6 +13,8 @@

#pragma once

#include "global.hpp"

#include <algorithm> // for max
#include <cstdint>
#include <ostream>
Expand Down Expand Up @@ -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();
}
Expand Down
4 changes: 3 additions & 1 deletion src/map/location.hpp
Expand Up @@ -19,6 +19,8 @@
class config;
class variable_set;

#include "global.hpp"

#include <array>
#include <cmath>
#include <cstdlib>
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 5512eb6

Please sign in to comment.