remove remnants of C-Style includes

This commit is contained in:
Dennis Luxen 2014-01-29 11:31:39 +01:00
parent cd6874ca60
commit 3be644265b

View File

@ -29,7 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define RESTRICTION_H_ #define RESTRICTION_H_
#include "../typedefs.h" #include "../typedefs.h"
#include <climits>
#include <limits>
struct TurnRestriction { struct TurnRestriction {
NodeID viaNode; NodeID viaNode;
@ -60,8 +61,8 @@ struct TurnRestriction {
explicit TurnRestriction(NodeID viaNode) : explicit TurnRestriction(NodeID viaNode) :
viaNode(viaNode), viaNode(viaNode),
fromNode(UINT_MAX), fromNode(std::numeric_limits<unsigned>::max()),
toNode(UINT_MAX) { toNode(std::numeric_limits<unsigned>::max()) {
} }
explicit TurnRestriction(const bool isOnly = false) : explicit TurnRestriction(const bool isOnly = false) :
@ -93,9 +94,9 @@ struct InputRestrictionContainer {
explicit InputRestrictionContainer( explicit InputRestrictionContainer(
bool isOnly = false bool isOnly = false
) : ) :
fromWay(UINT_MAX), fromWay(std::numeric_limits<unsigned>::max()),
toWay(UINT_MAX), toWay(std::numeric_limits<unsigned>::max()),
viaNode(UINT_MAX) viaNode(std::numeric_limits<unsigned>::max())
{ {
restriction.flags.isOnly = isOnly; restriction.flags.isOnly = isOnly;
} }
@ -105,10 +106,10 @@ struct InputRestrictionContainer {
} }
static InputRestrictionContainer max_value() { static InputRestrictionContainer max_value() {
return InputRestrictionContainer( return InputRestrictionContainer(
UINT_MAX, std::numeric_limits<unsigned>::max(),
UINT_MAX, std::numeric_limits<unsigned>::max(),
UINT_MAX, std::numeric_limits<unsigned>::max(),
UINT_MAX std::numeric_limits<unsigned>::max()
); );
} }
}; };