[Libreoffice-commits] .: registry/tools

[Stephan Bergmann]

 registry/tools/reg2bin.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b477fce5f8b8f9340cce8da8239c3e93800f0b62
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jan 31 19:18:38 2013 +0100

    Some fixes for previous commit (Clang)
    
    Change-Id: If41321bc1c79cb475aae1c4588f8663beccd2209

diff --git a/registry/tools/reg2bin.cxx b/registry/tools/reg2bin.cxx
index 94012cb..08443b0 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 \""