Author: wyoung
Date: Thu Aug 13 15:35:46 2009
New Revision: 2560
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2560&view=rev
Log:
More int size tweaks to avoid build warnings with VC++ on x64
Modified:
trunk/examples/simple1.cpp
trunk/lib/dbdriver.h
trunk/lib/field_names.cpp
trunk/lib/field_types.cpp
trunk/lib/mystring.cpp
trunk/lib/row.cpp
trunk/mysql++.bkl
Modified: trunk/examples/simple1.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/simple1.cpp?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/examples/simple1.cpp (original)
+++ trunk/examples/simple1.cpp Thu Aug 13 15:35:46 2009
@@ -48,6 +48,9 @@
mysqlpp::Connection conn(false);
if (conn.connect(mysqlpp::examples::db_name, cmdline.server(),
cmdline.user(), cmdline.pass())) {
+ conn.disconnect();
+ conn.connect(mysqlpp::examples::db_name, cmdline.server(),
+ cmdline.user(), cmdline.pass());
// Retrieve a subset of the sample stock table set up by resetdb
// and display it.
mysqlpp::Query query = conn.query("select item from stock");
Modified: trunk/lib/dbdriver.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/dbdriver.h?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/lib/dbdriver.h (original)
+++ trunk/lib/dbdriver.h Thu Aug 13 15:35:46 2009
@@ -195,7 +195,10 @@
///
/// \sa escape_string_no_conn(char*, const char*, size_t)
size_t escape_string(char* to, const char* from, size_t length)
- { return mysql_real_escape_string(&mysql_, to, from,
length); }
+ {
+ return mysql_real_escape_string(&mysql_, to, from,
+ (unsigned long)length);
+ }
/// \brief Return a SQL-escaped version of a character buffer
///
@@ -247,7 +250,9 @@
/// \sa escape_string(char*, const char*, size_t)
static size_t escape_string_no_conn(char* to, const char* from,
size_t length)
- { return mysql_escape_string(to, from, length); }
+ {
+ return mysql_escape_string(to, from, (unsigned long)length);
+ }
/// \brief SQL-escapes the given string without reference to the
/// character set of a database server.
@@ -261,7 +266,9 @@
///
/// Wraps \c mysql_real_query() in the MySQL C API.
bool execute(const char* qstr, size_t length)
- { return !mysql_real_query(&mysql_, qstr, length); }
+ {
+ return !mysql_real_query(&mysql_, qstr, (unsigned long)length);
+ }
/// \brief Returns the next raw C API row structure from the given
/// result set.
@@ -296,14 +303,14 @@
MYSQL_FIELD* fetch_field(MYSQL_RES* res, size_t i = UINT_MAX) const
{
return i == UINT_MAX ? mysql_fetch_field(res) :
- mysql_fetch_field_direct(res, i);
+ mysql_fetch_field_direct(res, (unsigned int)i);
}
/// \brief Jumps to the given field within the result set
///
/// Wraps \c mysql_field_seek() in MySQL C API.
void field_seek(MYSQL_RES* res, size_t field) const
- { mysql_field_seek(res, field); }
+ { mysql_field_seek(res, MYSQL_FIELD_OFFSET(field)); }
/// \brief Releases memory used by a result set
///
Modified: trunk/lib/field_names.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/field_names.cpp?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/lib/field_names.cpp (original)
+++ trunk/lib/field_names.cpp Thu Aug 13 15:35:46 2009
@@ -39,7 +39,7 @@
void
FieldNames::init(const ResultBase* res)
{
- int num = res->num_fields();
+ size_t num = res->num_fields();
reserve(num);
for (int i = 0; i < num; i++) {
Modified: trunk/lib/field_types.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/field_types.cpp?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/lib/field_types.cpp (original)
+++ trunk/lib/field_types.cpp Thu Aug 13 15:35:46 2009
@@ -35,10 +35,10 @@
void FieldTypes::init(const ResultBase* res)
{
- int num = res->num_fields();
+ size_t num = res->num_fields();
reserve(num);
- for (int i = 0; i < num; i++) {
- push_back(res->field(i).type());
+ for (size_t i = 0; i < num; i++) {
+ push_back(res->field(unsigned(i)).type());
}
}
Modified: trunk/lib/mystring.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/mystring.cpp?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/lib/mystring.cpp (original)
+++ trunk/lib/mystring.cpp Thu Aug 13 15:35:46 2009
@@ -38,7 +38,7 @@
String::at(size_type pos) const
{
if (pos >= size()) {
- throw BadIndex("String", pos, size());
+ throw BadIndex("String", int(pos), int(size()));
}
else {
return buffer_->data()[pos];
Modified: trunk/lib/row.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/row.cpp?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/lib/row.cpp (original)
+++ trunk/lib/row.cpp Thu Aug 13 15:35:46 2009
@@ -45,7 +45,7 @@
data_.push_back(value_type(
is_null ? "NULL" : row[i],
is_null ? 4 : lengths[i],
- res->field_type(i),
+ res->field_type(int(i)),
is_null));
}
@@ -69,7 +69,7 @@
return data_[i];
}
else {
- throw BadIndex("Row", i, size());
+ throw BadIndex("Row", int(i), int(size()));
}
}
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2560&r1=2559&r2=2560&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Thu Aug 13 15:35:46 2009
@@ -24,7 +24,7 @@
</option>
<set var="MYSQL_WIN_DIR">
- C:\Program Files\MySQL\MySQL Server 5.1
+ C:\Program Files (x86)\MySQL\MySQL Server 5.1
</set>
<set var="DEBUGINFO">
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
