games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-14 02:33:51 +02:00
Code Issues Releases Activity

gcc compile fix

Browse Source
This commit is contained in:
Ivan Savenko 2013-04-18 07:55:57 +00:00
parent 850f47261d
commit 857274a670
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/GameConstants.h
View File

@ -169,7 +169,8 @@ template<typename Der, typename Num>
std::ostream & operator << (std::ostream & os, BaseForID<Der, Num> id) std::ostream & operator << (std::ostream & os, BaseForID<Der, Num> id)
{ {
//We use common type with short to force char and unsigned char to be promoted and formatted as numbers. //We use common type with short to force char and unsigned char to be promoted and formatted as numbers.
return os << boost::common_type<short, Num>::type(id.getNum()); typedef typename std::common_type<short, Num>::type Number;
return os << static_cast<Number>(id.getNum());
} }
class ArtifactInstanceID : public BaseForID<ArtifactInstanceID, si32> class ArtifactInstanceID : public BaseForID<ArtifactInstanceID, si32>