Commit e2314ba3 authored by msobczak's avatar msobczak

Pedantic.

parent d83f628f
......@@ -22,7 +22,7 @@ void row::add_properties(column_properties const &cp)
std::string const & originalName = cp.get_name();
if (uppercaseColumnNames_)
{
for (size_t i = 0; i != originalName.size(); ++i)
for (std::size_t i = 0; i != originalName.size(); ++i)
{
columnName.push_back(std::toupper(originalName[i]));
}
......
......@@ -117,7 +117,7 @@ public:
return *this;
}
void skip(size_t num = 1) const
void skip(std::size_t num = 1) const
{
currentPos_ += num;
}
......
......@@ -71,7 +71,7 @@ void statement_impl::alloc()
void statement_impl::bind(values& values)
{
size_t cnt = 0;
std::size_t cnt = 0;
try
{
......@@ -97,7 +97,7 @@ void statement_impl::bind(values& values)
// named use element - check if it is used
const std::string placeholder = ":" + useName;
size_t pos = query_.find(placeholder);
std::size_t pos = query_.find(placeholder);
if (pos != std::string::npos)
{
const char nextChar = query_[pos + placeholder.size()];
......@@ -125,7 +125,7 @@ void statement_impl::bind(values& values)
}
catch (...)
{
for (size_t i = ++cnt; i != values.uses_.size(); ++i)
for (std::size_t i = ++cnt; i != values.uses_.size(); ++i)
{
values.add_unused(values.uses_[i], values.indicators_[i]);
}
......
......@@ -132,7 +132,7 @@ public:
return *this;
}
void skip(size_t num = 1) const
void skip(std::size_t num = 1) const
{
if (row_ != NULL)
{
......@@ -212,10 +212,10 @@ private:
std::vector<details::standard_use_type*> uses_;
std::map<details::use_type_base*, eIndicator*> unused_;
std::vector<eIndicator*> indicators_;
std::map<std::string, size_t> index_;
std::map<std::string, std::size_t> index_;
std::vector<details::copy_base *> deepCopies_;
mutable size_t currentPos_;
mutable std::size_t currentPos_;
bool uppercaseColumnNames_;
......@@ -225,7 +225,7 @@ private:
template <typename T>
T get_from_uses(std::string const &name, T const &nullValue) const
{
std::map<std::string, size_t>::const_iterator pos = index_.find(name);
std::map<std::string, std::size_t>::const_iterator pos = index_.find(name);
if (pos != index_.end())
{
if (*indicators_[pos->second] == eNull)
......@@ -241,7 +241,7 @@ private:
template <typename T>
T get_from_uses(std::string const &name) const
{
std::map<std::string, size_t>::const_iterator pos = index_.find(name);
std::map<std::string, std::size_t>::const_iterator pos = index_.find(name);
if (pos != index_.end())
{
return get_from_uses<T>(pos->second);
......@@ -250,7 +250,7 @@ private:
}
template <typename T>
T get_from_uses(size_t pos) const
T get_from_uses(std::size_t pos) const
{
details::standard_use_type* u = uses_[pos];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment