[niepce] C++: fix a few new warnings with clang.
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] C++: fix a few new warnings with clang.
- Date: Sat, 24 Feb 2018 00:56:18 +0000 (UTC)
commit 38306cecc5c38df79ffe2c45b5db2a852dbae39a
Author: Hubert Figuière <hub figuiere net>
Date: Thu Feb 22 01:37:38 2018 -0500
C++: fix a few new warnings with clang.
src/engine/db/libmetadata.cpp | 6 +++---
src/fwk/toolkit/metadatawidget.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/engine/db/libmetadata.cpp b/src/engine/db/libmetadata.cpp
index 1abed0f..7ade2ca 100644
--- a/src/engine/db/libmetadata.cpp
+++ b/src/engine/db/libmetadata.cpp
@@ -60,13 +60,13 @@ IndexToXmp property_index_to_xmp(fwk::PropertyIndex index)
PropsToXmpMap::const_iterator iter = propmap.find(index);
if (iter == propmap.end()) {
// not found
- return {ns: nullptr, property: nullptr};
+ return {nullptr, nullptr};
}
if (iter->second.first == NULL || iter->second.second == NULL) {
// no XMP equivalent
- return {ns: nullptr, property: nullptr};
+ return {nullptr, nullptr};
}
- return {ns: iter->second.first, property: iter->second.second};
+ return {iter->second.first, iter->second.second};
}
fwk::PropertyBagPtr libmetadata_to_properties(const LibMetadata* meta,
diff --git a/src/fwk/toolkit/metadatawidget.cpp b/src/fwk/toolkit/metadatawidget.cpp
index ce38485..39f846e 100644
--- a/src/fwk/toolkit/metadatawidget.cpp
+++ b/src/fwk/toolkit/metadatawidget.cpp
@@ -441,7 +441,7 @@ void MetaDataWidget::add_data(const MetaDataFormat * current,
break;
default:
if (!set_string_data(w, current->readonly, value)) {
- ERR_OUT("failed to set value for %ld", current->id);
+ ERR_OUT("failed to set value for %u", current->id);
}
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]