RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 01:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2066 from thorstenb/wip-janitorial-clang-2

Browse Source 
[werror] Fix c++11-compat-reserved-user-defined-literal
This commit is contained in:
Sage Weil 2014-07-03 13:56:01 -07:00
commit 235c27ab8d
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cls/rbd/cls_rbd.cc
View File

@ -506,7 +506,7 @@ int get_protection_status(cls_method_context_t hctx, bufferlist *in,
key_from_snap_id(snap_id.val, &snapshot_key);
r = read_key(hctx, snapshot_key, &snap);
if (r < 0) {
CLS_ERR("could not read key for snapshot id %"PRIu64, snap_id.val);
CLS_ERR("could not read key for snapshot id %" PRIu64, snap_id.val);
return r;
}
@ -573,7 +573,7 @@ int set_protection_status(cls_method_context_t hctx, bufferlist *in,
key_from_snap_id(snap_id.val, &snapshot_key);
r = read_key(hctx, snapshot_key, &snap);
if (r < 0) {
CLS_ERR("could not read key for snapshot id %"PRIu64, snap_id.val);
CLS_ERR("could not read key for snapshot id %" PRIu64, snap_id.val);
return r;
}
@ -957,7 +957,7 @@ int add_child(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
if (r < 0)
return r;
CLS_LOG(20, "add_child %s to (%"PRIu64", %s, %"PRIu64")", c_image_id.c_str(),
CLS_LOG(20, "add_child %s to (%" PRIu64 ", %s, %" PRIu64 ")", c_image_id.c_str(),
p_pool_id, p_image_id.c_str(), p_snap_id.val);
string key = parent_key(p_pool_id, p_image_id, p_snap_id);
@ -1011,7 +1011,7 @@ int remove_child(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
if (r < 0)
return r;
CLS_LOG(20, "remove_child %s from (%"PRIu64", %s, %"PRIu64")",
CLS_LOG(20, "remove_child %s from (%" PRIu64 ", %s, %" PRIu64 ")",
c_image_id.c_str(), p_pool_id, p_image_id.c_str(),
p_snap_id.val);
@ -1072,7 +1072,7 @@ int get_children(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
if (r < 0)
return r;
CLS_LOG(20, "get_children of (%"PRIu64", %s, %"PRIu64")",
CLS_LOG(20, "get_children of (%" PRIu64 ", %s, %" PRIu64 ")",
p_pool_id, p_image_id.c_str(), p_snap_id.val);
string key = parent_key(p_pool_id, p_image_id, p_snap_id);

4
src/cls/rgw/cls_rgw.cc
View File

@ -755,7 +755,7 @@ int rgw_dir_suggest_changes(cls_method_context_t hctx, bufferlist *in, bufferlis
if (cur_disk.pending_map.empty()) {
if (cur_disk.exists) {
struct rgw_bucket_category_stats& old_stats = header.stats[cur_disk.meta.category];
CLS_LOG(10, "total_entries: %"PRId64" -> %"PRId64"\n", old_stats.num_entries, old_stats.num_entries - 1);
CLS_LOG(10, "total_entries: %" PRId64 " -> %" PRId64 "\n", old_stats.num_entries, old_stats.num_entries - 1);
old_stats.num_entries--;
old_stats.total_size -= cur_disk.meta.size;
old_stats.total_size_rounded -= get_rounded_size(cur_disk.meta.size);
@ -771,7 +771,7 @@ int rgw_dir_suggest_changes(cls_method_context_t hctx, bufferlist *in, bufferlis
return ret;
break;
case CEPH_RGW_UPDATE:
CLS_LOG(10, "CEPH_RGW_UPDATE name=%s total_entries: %"PRId64" -> %"PRId64"\n", cur_change.name.c_str(), stats.num_entries, stats.num_entries + 1);
CLS_LOG(10, "CEPH_RGW_UPDATE name=%s total_entries: %" PRId64 " -> %" PRId64 "\n", cur_change.name.c_str(), stats.num_entries, stats.num_entries + 1);
stats.num_entries++;
stats.total_size += cur_change.meta.size;
stats.total_size_rounded += get_rounded_size(cur_change.meta.size);

4
src/common/perf_counters.cc
View File

@ -249,7 +249,7 @@ void PerfCounters::dump_formatted(Formatter *f, bool schema)
f->dump_unsigned("sum", a.first);
} else if (d->type & PERFCOUNTER_TIME) {
f->dump_unsigned("avgcount", a.second);
f->dump_format_unquoted("sum", "%"PRId64".%09"PRId64,
f->dump_format_unquoted("sum", "%" PRId64 ".%09" PRId64,
a.first / 1000000000ull,
a.first % 1000000000ull);
} else {
@ -261,7 +261,7 @@ void PerfCounters::dump_formatted(Formatter *f, bool schema)
if (d->type & PERFCOUNTER_U64) {
f->dump_unsigned(d->name, v);
} else if (d->type & PERFCOUNTER_TIME) {
f->dump_format_unquoted(d->name, "%"PRId64".%09"PRId64,
f->dump_format_unquoted(d->name, "%" PRId64 ".%09" PRId64,
v / 1000000000ull,
v % 1000000000ull);
} else {