Skip to content

Commit c40ff51

Browse files
committed
fix some compile warnings
1 parent 27031df commit c40ff51

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/oatpp-postgresql/Executor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace {
4545

4646
class VersionRow : public oatpp::DTO {
4747

48-
DTO_INIT(VersionRow, DTO);
48+
DTO_INIT(VersionRow, DTO)
4949

5050
DTO_FIELD(Int64, version);
5151

@@ -90,7 +90,7 @@ Executor::QueryParams::QueryParams(const StringTemplate& queryTemplate,
9090
paramLengths.resize(count);
9191
paramFormats.resize(count);
9292

93-
for(v_uint32 i = 0; i < count; i ++) {
93+
for(v_int32 i = 0; i < count; i ++) {
9494

9595
const auto& var = queryTemplate.getTemplateVariables()[i];
9696
auto it = params.find(var.name);

src/oatpp-postgresql/mapping/Deserializer.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,8 @@ oatpp::Void Deserializer::deserializeSubArray(const Type* type,
347347
auto itemType = dispatcher->getItemType();
348348
auto collection = dispatcher->createObject();
349349

350-
if(dimension < meta.dimensions.size() - 1) {
350+
const v_int32 metaDimensions = meta.dimensions.size() - 1;
351+
if(dimension < metaDimensions) {
351352

352353
auto size = meta.dimensions[dimension];
353354

@@ -358,7 +359,7 @@ oatpp::Void Deserializer::deserializeSubArray(const Type* type,
358359

359360
return collection;
360361

361-
} else if(dimension == meta.dimensions.size() - 1) {
362+
} else if(dimension == metaDimensions) {
362363

363364
auto size = meta.dimensions[dimension];
364365

src/oatpp-postgresql/mapping/Deserializer.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class Deserializer {
111111
template<typename T>
112112
static const oatpp::Type* generateMultidimensionalArrayType(const InData& data) {
113113

114-
if(data.size < sizeof(v_int32)) {
114+
if(data.size < static_cast<v_buff_size>(sizeof(v_int32))) {
115115
return nullptr;
116116
}
117117

src/oatpp-postgresql/mapping/type/Uuid.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ UuidObject::UuidObject(const oatpp::String& text) {
4141
std::memcpy(m_data, stream.getData(), DATA_SIZE);
4242
}
4343

44-
const p_char8 UuidObject::getData() const {
45-
return (const p_char8) m_data;
44+
cp_char8 UuidObject::getData() const {
45+
return static_cast<cp_char8>(m_data);
4646
}
4747

4848
v_buff_size UuidObject::getSize() const {

src/oatpp-postgresql/mapping/type/Uuid.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class UuidObject {
5959
* Get raw data of ObjectId.
6060
* @return
6161
*/
62-
const p_char8 getData() const;
62+
cp_char8 getData() const;
6363

6464
/**
6565
* Get size of ObjectId data.

0 commit comments

Comments
 (0)