Skip to content

Commit 1c85ab8

Browse files
committed
tidy some namespacing just for consistency
1 parent 43da43e commit 1c85ab8

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

tmxlite/include/tmxlite/Tileset.hpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*********************************************************************
2-
Matt Marchant 2016 - 2023
2+
Matt Marchant (and contributors) 2016 - 2026
33
http://trederia.blogspot.com
44
55
tmxlite - Zlib license.
@@ -28,12 +28,13 @@ source distribution.
2828
#pragma once
2929

3030
#include <tmxlite/Config.hpp>
31-
#include <tmxlite/Property.hpp>
3231
#include <tmxlite/ObjectGroup.hpp>
32+
#include <tmxlite/Property.hpp>
3333

34+
#include <array>
35+
#include <limits>
3436
#include <string>
3537
#include <vector>
36-
#include <array>
3738

3839
namespace pugi
3940
{
@@ -117,7 +118,7 @@ namespace tmx
117118
struct Terrain final
118119
{
119120
std::string name;
120-
uint32_t tileID = static_cast<uint32_t>(-1);
121+
std::uint32_t tileID = std::numeric_limits<uint32_t>::max();
121122
std::vector<Property> properties;
122123
};
123124

tmxlite/src/Map.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*********************************************************************
2-
Matt Marchant 2016 - 2023
2+
Matt Marchant (and contributors) 2016 - 2026
33
http://trederia.blogspot.com
44
55
tmxlite - Zlib license.
@@ -30,14 +30,14 @@ source distribution.
3030
#else
3131
#include "detail/pugixml.hpp"
3232
#endif
33-
#include <tmxlite/Map.hpp>
3433
#include <tmxlite/FreeFuncs.hpp>
35-
#include <tmxlite/ObjectGroup.hpp>
3634
#include <tmxlite/ImageLayer.hpp>
37-
#include <tmxlite/TileLayer.hpp>
3835
#include <tmxlite/LayerGroup.hpp>
39-
#include <tmxlite/detail/Log.hpp>
36+
#include <tmxlite/Map.hpp>
37+
#include <tmxlite/ObjectGroup.hpp>
38+
#include <tmxlite/TileLayer.hpp>
4039
#include <tmxlite/detail/Android.hpp>
40+
#include <tmxlite/detail/Log.hpp>
4141

4242
#include <queue>
4343

@@ -113,8 +113,8 @@ bool Map::parseMapNode(const pugi::xml_node& mapNode)
113113
return reset();
114114
}
115115

116-
m_version.upper = static_cast<uint16_t>(STOI(attribString.substr(0, pointPos)));
117-
m_version.lower = static_cast<uint16_t>(STOI(attribString.substr(pointPos + 1)));
116+
m_version.upper = static_cast<std::uint16_t>(STOI(attribString.substr(0, pointPos)));
117+
m_version.lower = static_cast<std::uint16_t>(STOI(attribString.substr(pointPos + 1)));
118118

119119
m_class = mapNode.attribute("class").as_string();
120120

0 commit comments

Comments
 (0)