From 415cdd74e5be8a968566575c78f9ab8136fef1ca Mon Sep 17 00:00:00 2001 From: Chris Beck Date: Sun, 16 Oct 2016 11:11:42 -0400 Subject: [PATCH] correct compilation errors, ODR violation fixes up commit 30c1a852d37c555c6b5551d03d792baf9e08040e --- src/font/constants.cpp | 6 +++--- src/font/constants.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/font/constants.cpp b/src/font/constants.cpp index bc59ea35a5fd..9f79ba95638d 100644 --- a/src/font/constants.cpp +++ b/src/font/constants.cpp @@ -34,9 +34,9 @@ const SDL_Color NORMAL_COLOR = {0xDD,0xDD,0xDD,0}, BIGMAP_COLOR = {0xFF,0xFF,0xFF,0}; const SDL_Color DISABLED_COLOR = inverse(PETRIFIED_COLOR); -CONSTEXPR int SIZE_NORMAL = 14; +const int SIZE_NORMAL = 14; -CONSTEXPR int +const int SIZE_TINY = 10 * SIZE_NORMAL / 14, SIZE_SMALL = 12 * SIZE_NORMAL / 14, @@ -47,7 +47,7 @@ CONSTEXPR int SIZE_XLARGE = 24 * SIZE_NORMAL / 14 ; -CONSTEXPR size_t max_text_line_width = 4096; +const size_t max_text_line_width = 4096; const std::string ellipsis = "...", diff --git a/src/font/constants.hpp b/src/font/constants.hpp index 87f7ebd19cc7..d8400ef22ac1 100644 --- a/src/font/constants.hpp +++ b/src/font/constants.hpp @@ -34,7 +34,7 @@ extern const int SIZE_TINY, SIZE_SMALL, // For arbitrary scaling: // (Not used in defining the SIZE_* consts because of spurious compiler warnings.) -const inline int relative_size(int size) +inline int relative_size(int size) { return (SIZE_NORMAL * size / 14); }