From 9bd733502a774baad0c6d9644310da844c68e78f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 18 Oct 2010 13:58:01 +0200 Subject: Cosmetic changes --- libxsde/xsde/cxx/hybrid/parser-map.cxx | 2 +- libxsde/xsde/cxx/hybrid/serializer-map.cxx | 2 +- libxsde/xsde/cxx/iso8859-1.cxx | 8 ++++---- libxsde/xsde/cxx/iso8859-1.ixx | 8 ++++---- libxsde/xsde/cxx/string-search.cxx | 2 +- xsde/cxx/serializer/attribute-validation-source.cxx | 4 ++-- xsde/cxx/serializer/element-validation-source.cxx | 4 ++-- xsde/cxx/serializer/serializer-source.cxx | 8 ++++---- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libxsde/xsde/cxx/hybrid/parser-map.cxx b/libxsde/xsde/cxx/hybrid/parser-map.cxx index 33b0a53..9bd244e 100644 --- a/libxsde/xsde/cxx/hybrid/parser-map.cxx +++ b/libxsde/xsde/cxx/hybrid/parser-map.cxx @@ -21,7 +21,7 @@ namespace xsde if (size_ == 0) return 0; - int r (1); + int r = 1; size_t m; size_t l = 0; size_t h = size_ - 1; diff --git a/libxsde/xsde/cxx/hybrid/serializer-map.cxx b/libxsde/xsde/cxx/hybrid/serializer-map.cxx index be32cc4..6066649 100644 --- a/libxsde/xsde/cxx/hybrid/serializer-map.cxx +++ b/libxsde/xsde/cxx/hybrid/serializer-map.cxx @@ -23,7 +23,7 @@ namespace xsde if (size_ == 0) return 0; - int r (1); + int r = 1; size_t m; size_t l = 0; size_t h = size_ - 1; diff --git a/libxsde/xsde/cxx/iso8859-1.cxx b/libxsde/xsde/cxx/iso8859-1.cxx index b52a284..9e01f66 100644 --- a/libxsde/xsde/cxx/iso8859-1.cxx +++ b/libxsde/xsde/cxx/iso8859-1.cxx @@ -16,7 +16,7 @@ namespace xsde { for (; *s != 0; ++s) { - unsigned char c (*s); + unsigned char c = *s; if (c < 0x80) { @@ -73,7 +73,7 @@ namespace xsde for (; s != end; ++s) { - unsigned char c (*s); + unsigned char c = *s; if (c < 0x80) { @@ -128,7 +128,7 @@ namespace xsde { for (; *s != 0; ++s) { - unsigned char c (*s); + unsigned char c = *s; if (c < 0x80) *r++ = c; @@ -151,7 +151,7 @@ namespace xsde for (; s != end; ++s) { - unsigned char c (*s); + unsigned char c = *s; if (c < 0x80) *r++ = c; diff --git a/libxsde/xsde/cxx/iso8859-1.ixx b/libxsde/xsde/cxx/iso8859-1.ixx index 716be53..cbff24d 100644 --- a/libxsde/xsde/cxx/iso8859-1.ixx +++ b/libxsde/xsde/cxx/iso8859-1.ixx @@ -20,7 +20,7 @@ namespace xsde for (; *s != 0; ++s, ++l) { - unsigned char c (*s); + unsigned char c = *s; if (c > 0x7F) { @@ -53,7 +53,7 @@ namespace xsde for (; s != end; ++s, ++l) { - unsigned char c (*s); + unsigned char c = *s; if (c > 0x7F) { @@ -85,7 +85,7 @@ namespace xsde for (; *s != 0; ++s, ++l) { - unsigned char c (*s); + unsigned char c = *s; if (c > 0x7F) { @@ -112,7 +112,7 @@ namespace xsde for (; s != end; ++s, ++l) { - unsigned char c (*s); + unsigned char c = *s; if (c > 0x7F) { diff --git a/libxsde/xsde/cxx/string-search.cxx b/libxsde/xsde/cxx/string-search.cxx index bb72a91..535ff7c 100644 --- a/libxsde/xsde/cxx/string-search.cxx +++ b/libxsde/xsde/cxx/string-search.cxx @@ -16,7 +16,7 @@ namespace xsde if (size == 0) return 0; - int r (1); + int r = 1; size_t m; size_t l = 0; size_t h = size - 1; diff --git a/xsde/cxx/serializer/attribute-validation-source.cxx b/xsde/cxx/serializer/attribute-validation-source.cxx index 8bea35a..3457538 100644 --- a/xsde/cxx/serializer/attribute-validation-source.cxx +++ b/xsde/cxx/serializer/attribute-validation-source.cxx @@ -343,8 +343,8 @@ namespace CXX os << "delete[] ns;" << "delete[] name;"; else - os << "::xsde::cxx::free (const_cast (ns));" - << "::xsde::cxx::free (const_cast (name));"; + os << "::xsde::cxx::free (const_cast< char* > (ns));" + << "::xsde::cxx::free (const_cast< char* > (name));"; os << "}" << "if (!r)" << endl diff --git a/xsde/cxx/serializer/element-validation-source.cxx b/xsde/cxx/serializer/element-validation-source.cxx index bb09275..21fb6b6 100644 --- a/xsde/cxx/serializer/element-validation-source.cxx +++ b/xsde/cxx/serializer/element-validation-source.cxx @@ -751,8 +751,8 @@ namespace CXX os << "delete[] ns;" << "delete[] name;"; else - os << "::xsde::cxx::free (const_cast (ns));" - << "::xsde::cxx::free (const_cast (name));"; + os << "::xsde::cxx::free (const_cast< char* > (ns));" + << "::xsde::cxx::free (const_cast< char* > (name));"; os << "}" << "if (!r)" << endl diff --git a/xsde/cxx/serializer/serializer-source.cxx b/xsde/cxx/serializer/serializer-source.cxx index ab5c123..630d052 100644 --- a/xsde/cxx/serializer/serializer-source.cxx +++ b/xsde/cxx/serializer/serializer-source.cxx @@ -1394,8 +1394,8 @@ namespace CXX os << "delete[] ns;" << "delete[] name;"; else - os << "::xsde::cxx::free (const_cast (ns));" - << "::xsde::cxx::free (const_cast (name));"; + os << "::xsde::cxx::free (const_cast< char* > (ns));" + << "::xsde::cxx::free (const_cast< char* > (name));"; os << "}" << "if (!r)" << endl @@ -1654,8 +1654,8 @@ namespace CXX os << "delete[] ns;" << "delete[] name;"; else - os << "::xsde::cxx::free (const_cast (ns));" - << "::xsde::cxx::free (const_cast (name));"; + os << "::xsde::cxx::free (const_cast< char* > (ns));" + << "::xsde::cxx::free (const_cast< char* > (name));"; os << "}" << "if (!r)" << endl -- cgit v1.1