mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
Compile fix for boost <= 1.37
This commit is contained in:
@@ -6,6 +6,7 @@
|
|||||||
#include "../int3.h"
|
#include "../int3.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
#include <boost/version.hpp>
|
||||||
#include <boost/type_traits/is_integral.hpp>
|
#include <boost/type_traits/is_integral.hpp>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -31,7 +32,9 @@ bool isItIn(const SDL_Rect * rect, int x, int y);
|
|||||||
template<typename IntType>
|
template<typename IntType>
|
||||||
std::string makeNumberShort(IntType number) //the output is a string containing at most 5 characters [4 if positive] (eg. intead 10000 it gives 10k)
|
std::string makeNumberShort(IntType number) //the output is a string containing at most 5 characters [4 if positive] (eg. intead 10000 it gives 10k)
|
||||||
{
|
{
|
||||||
|
#if BOOST_VERSION >= 103800
|
||||||
BOOST_MPL_ASSERT_MSG( boost::is_integral<IntType>::value, NON_INTEGRAL_TYPES_ARE_NOT_ALLOWED, (IntType) ); //it should make noise if IntType is not integral type
|
BOOST_MPL_ASSERT_MSG( boost::is_integral<IntType>::value, NON_INTEGRAL_TYPES_ARE_NOT_ALLOWED, (IntType) ); //it should make noise if IntType is not integral type
|
||||||
|
#endif
|
||||||
|
|
||||||
int initialLength;
|
int initialLength;
|
||||||
bool negative = (number < 0);
|
bool negative = (number < 0);
|
||||||
|
Reference in New Issue
Block a user