diff options
| author | Charles Pigott <charlespigott@googlemail.com> | 2018-04-21 14:54:46 +0100 |
|---|---|---|
| committer | Patric Stout <truebrain@openttd.org> | 2018-04-21 16:28:50 +0200 |
| commit | 5c5267726f179554b928f19360cd98457cd947e4 (patch) | |
| tree | a21c1da17f1be78193ba0f140e4a3d3b7adead99 | |
| parent | e8de33a61fcecdd09d3c9bdb68c64c5418dbd437 (diff) | |
| download | openttd-5c5267726f179554b928f19360cd98457cd947e4.tar.xz | |
Fix: Warning about base set template instantiations with clang
| -rw-r--r-- | src/base_media_base.h | 5 | ||||
| -rw-r--r-- | src/base_media_func.h | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/base_media_base.h b/src/base_media_base.h index d5de6c373..7614118b7 100644 --- a/src/base_media_base.h +++ b/src/base_media_base.h @@ -219,6 +219,11 @@ public: static bool HasSet(const ContentInfo *ci, bool md5sum); }; +template <class Tbase_set> /* static */ const char *BaseMedia<Tbase_set>::ini_set; +template <class Tbase_set> /* static */ const Tbase_set *BaseMedia<Tbase_set>::used_set; +template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::available_sets; +template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::duplicate_sets; + /** * Check whether there's a base set matching some information. * @param ci The content info to compare it to. diff --git a/src/base_media_func.h b/src/base_media_func.h index e3678d5a1..f45956f76 100644 --- a/src/base_media_func.h +++ b/src/base_media_func.h @@ -17,11 +17,6 @@ #include "ini_type.h" #include "string_func.h" -template <class Tbase_set> /* static */ const char *BaseMedia<Tbase_set>::ini_set; -template <class Tbase_set> /* static */ const Tbase_set *BaseMedia<Tbase_set>::used_set; -template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::available_sets; -template <class Tbase_set> /* static */ Tbase_set *BaseMedia<Tbase_set>::duplicate_sets; - /** * Try to read a single piece of metadata and return false if it doesn't exist. * @param name the name of the item to fetch. |