summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-01-31 19:18:38 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-01-31 19:18:38 +0100
commitb477fce5f8b8f9340cce8da8239c3e93800f0b62 (patch)
tree66438248b83bda75d0fdfae6278250880d222cd2 /registry
parent7a9fed14d45ba99d5639d4cc80286ee146b8d40a (diff)
Some fixes for previous commit (Clang)
Change-Id: If41321bc1c79cb475aae1c4588f8663beccd2209
Diffstat (limited to 'registry')
-rw-r--r--registry/tools/reg2bin.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx
index 94012cbd675c..08443b045dae 100644
--- a/registry/tools/reg2bin.cxx
+++ b/registry/tools/reg2bin.cxx
@@ -215,7 +215,7 @@ typereg::Reader getReader(RegistryKey & key, std::vector< char > * buffer) {
std::exit(EXIT_FAILURE);
}
if (size == 0
- || size > std::numeric_limits< std::vector< char >::size_type >::max())
+ /* || size > std::numeric_limits< std::vector< char >::size_type >::max() */)
{
std::cerr
<< "Bad binary value size " << size << " of key \"" << key.getName()
@@ -482,7 +482,7 @@ void readModule(
RTConstValue v(reader.getFieldValue(j));
if (v.m_type != RT_TYPE_INT32) {
std::cerr
- << "Unexpected type " +v.m_type
+ << "Unexpected type " << +v.m_type
<< " of value of field \"" << reader.getFieldName(j)
<< "\" of enum type with key \"" << sub.getName()
<< "\" in registry \"" << roots[0].getRegistryName()
@@ -852,7 +852,7 @@ void readModule(
break;
default:
std::cerr
- << "Unexpected type " +v.m_type
+ << "Unexpected type " << +v.m_type
<< " of value of field \"" << reader.getFieldName(j)
<< "\" of constant group with key \""
<< sub.getName() << "\" in registry \""