ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-30 07:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix VS2013 warnings about integer conversions

Browse Source
This commit is contained in:
Vinnie Falco
2014-04-17 11:57:48 -07:00
parent fdfcebd1cb
commit df3f5e442d
13 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/beast_asio/http/HTTPClientType.cpp
View File

@@ -598,7 +598,7 @@ public:
void print (HTTPMessage const& m)
{
for (std::size_t i = 0; i < m.headers().size(); ++i)
for (int i = 0; i < m.headers().size(); ++i)
{
HTTPField const f (m.headers()[i]);
std::stringstream ss;

4
modules/beast_asio/http/HTTPHeaders.cpp
View File

@@ -54,13 +54,13 @@ std::size_t HTTPHeaders::size () const
return m_fields.size ();
}
HTTPField HTTPHeaders::at (std::size_t index) const
HTTPField HTTPHeaders::at (int index) const
{
return HTTPField (m_fields.getAllKeys () [index],
m_fields.getAllValues () [index]);
}
HTTPField HTTPHeaders::operator[] (std::size_t index) const
HTTPField HTTPHeaders::operator[] (int index) const
{
return at (index);
}

4
modules/beast_asio/http/HTTPHeaders.h
View File

@@ -51,8 +51,8 @@ public:
/** Random access to fields by index. */
/** @{ */
HTTPField at (std::size_t index) const;
HTTPField operator[] (std::size_t index) const;
HTTPField at (int index) const;
HTTPField operator[] (int index) const;
/** @} */
/** Associative access to fields by name.

4
modules/beast_core/containers/ArrayAllocationBase.h
View File

@@ -85,9 +85,9 @@ public:
if (numAllocated != numElements)
{
if (numElements > 0)
elements.realloc ((size_t) numElements);
elements.reallocate ((size_t) numElements);
else
elements.free();
elements.free_up();
numAllocated = numElements;
}

4
modules/beast_core/memory/MemoryBlock.cpp
View File

@@ -125,14 +125,14 @@ void MemoryBlock::setSize (const size_t newSize, const bool initialiseToZero)
{
if (newSize <= 0)
{
data.free();
data.free_up();
size = 0;
}
else
{
if (data != nullptr)
{
data.realloc (newSize);
data.reallocate (newSize);
if (initialiseToZero && (newSize > size))
zeromem (data + size, newSize - size);

6
modules/beast_sqdb/api/blob.h
View File

@@ -76,9 +76,9 @@ public:
rowid id,
bool readAndWrite = false) noexcept;
std::size_t get_len();
Error read(std::size_t offset, void* buf, std::size_t toRead);
Error write(std::size_t offset, void const* buf, std::size_t toWrite);
int get_len();
Error read(int offset, void* buf, int toRead);
Error write(int offset, void const* buf, int toWrite);
void close();
private:

6
modules/beast_sqdb/source/blob.cpp
View File

@@ -91,18 +91,18 @@ Error blob::select(session& s,
return detail::sqliteError(__FILE__, __LINE__, result);
}
std::size_t blob::get_len()
int blob::get_len()
{
return sqlite3_blob_bytes(m_blob);
}
Error blob::read(std::size_t offset, void* buf, std::size_t toRead)
Error blob::read(int offset, void* buf, int toRead)
{
return detail::sqliteError(__FILE__, __LINE__,
sqlite3_blob_read(m_blob, static_cast<char*>(buf), toRead, offset));
}
Error blob::write(std::size_t offset, void const* buf, std::size_t toWrite)
Error blob::write(int offset, void const* buf, int toWrite)
{
return detail::sqliteError(__FILE__, __LINE__,
sqlite3_blob_write(m_blob, buf, toWrite, offset));

4
modules/beast_sqdb/source/use_type.cpp
View File

@@ -177,7 +177,7 @@ void standard_use_type::do_use()
result = sqlite3_bind_text(m_st->m_stmt,
m_iParam,
s.c_str(),
s.size() * sizeof(s[0]),
int(s.size() * sizeof(s[0])),
SQLITE_STATIC);
}
break;
@@ -188,7 +188,7 @@ void standard_use_type::do_use()
result = sqlite3_bind_text16(m_st->m_stmt,
m_iParam,
s.c_str(),
s.size() * sizeof(s[0]),
int(s.size() * sizeof(s[0])),
SQLITE_STATIC);
}
break;