Merge pull request #18 from mox-mox/dev

Fixing member data type for rect_t to uin32_t
This commit is contained in:
Sergey Naumov
2017-04-29 10:50:23 +03:00
committed by GitHub
3 changed files with 9 additions and 9 deletions

View File

@@ -57,7 +57,7 @@ target_link_libraries(i3ipc++
) )
target_compile_options(i3ipc++ target_compile_options(i3ipc++
PUBLIC -std=c++11 -Wall -Wextra -Wno-unused-parameter PRIVATE -std=c++11 -Wall -Wextra -Wno-unused-parameter
) )
target_compile_definitions(i3ipc++ target_compile_definitions(i3ipc++

View File

@@ -28,10 +28,10 @@ std::string get_socketpath();
* Primitive of rectangle * Primitive of rectangle
*/ */
struct rect_t { struct rect_t {
int x; ///< Position on X axis uint32_t x; ///< Position on X axis
int y; ///< Position on Y axis uint32_t y; ///< Position on Y axis
int width; ///< Width of rectangle uint32_t width; ///< Width of rectangle
int height; ///< Height of rectangle uint32_t height; ///< Height of rectangle
}; };
/** /**

View File

@@ -42,10 +42,10 @@ std::vector<std::ostream*> g_logging_err_outs = {
inline rect_t parse_rect_from_json(const Json::Value& value) { inline rect_t parse_rect_from_json(const Json::Value& value) {
return { return {
.x = value["x"].asInt(), .x = value["x"].asUInt(),
.y = value["y"].asInt(), .y = value["y"].asUInt(),
.width = value["width"].asInt(), .width = value["width"].asUInt(),
.height = value["height"].asInt(), .height = value["height"].asUInt(),
}; };
} }