cpp/openttd-patchpack/source Changeset - r22820:930d96d49ef1

Changeset - r22820:930d96d49ef1

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Charles Pigott - 6 years ago 2018-04-21 13:54:46
charlespigott@googlemail.com

Fix: Warning about base set template instantiations with clang

2 files changed with 5 insertions and 5 deletions:

src/base_media_base.h

src/base_media_func.h

0 comments (0 inline, 0 general)

src/base_media_base.h

➞

Show inline comments

@@ @@ -216,12 +216,17 @@ public: @@
 	 * @param md5sum whether to check the MD5 checksum
 	 * @return true iff we have an set matching.
 	 */
 	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.
  * @param md5sum Should the MD5 checksum be tested as well?
  * @param s The list with sets.
  * @return The filename of the first file of the base set, or \c NULL if there is no match.

src/base_media_func.h

➞

Show inline comments

@@ @@ -14,17 +14,12 @@ @@
 #include "base_media_base.h"
 #include "debug.h"
 #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.
  */
 #define fetch_metadata(name) \
 	item = metadata->GetItem(name, false); \

0 comments (0 inline, 0 general)