Author: wyoung
Date: Tue Dec 11 08:43:24 2007
New Revision: 2000
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=2000&view=rev
Log:
VC++ fixes
Modified:
trunk/Wishlist
trunk/examples/simple1.cpp
trunk/examples/simple2.cpp
trunk/lib/manip.h
trunk/lib/options.h
trunk/mysql++.bkl
trunk/test/test_string.cpp
Modified: trunk/Wishlist
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/Wishlist?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/Wishlist (original)
+++ trunk/Wishlist Tue Dec 11 08:43:24 2007
@@ -39,9 +39,6 @@
o Is MYSQLPP_QUERY_THISPTR still needed with VC++2003? The recent
manipulator changes and the removal of all operator<<(Query&,
const T&) may make it unnecessary.
-
- o Test with Visual Studio 2008 Professional and Express. If it
- works, update FAQ.
o Figure out how to name debug DLL and library under VC++ and
Xcode differently (trailing '_d'?) to avoid trouble when mixing
Modified: trunk/examples/simple1.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/simple1.cpp?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/examples/simple1.cpp (original)
+++ trunk/examples/simple1.cpp Tue Dec 11 08:43:24 2007
@@ -52,7 +52,8 @@
mysqlpp::Query query = conn.query("select item from stock");
if (mysqlpp::Result res = query.store()) {
cout << "We have:" << endl;
- for (int i = 0; mysqlpp::Row row = res[i]; ++i) {
+ mysqlpp::Row row;
+ for (int i = 0; row = res[i]; ++i) {
cout << '\t' << row[0] << endl;
}
}
Modified: trunk/examples/simple2.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/examples/simple2.cpp?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/examples/simple2.cpp (original)
+++ trunk/examples/simple2.cpp Tue Dec 11 08:43:24 2007
@@ -62,7 +62,8 @@
"Date" << endl << endl;
// Get each row in result set, and print its contents
- for (int i = 0; mysqlpp::Row row = res[i]; ++i) {
+ mysqlpp::Row row;
+ for (int i = 0; row = res[i]; ++i) {
cout << setw(30) << row["item"] << ' ' <<
setw(9) << row["num"] << ' ' <<
setw(9) << row["weight"] << ' '
<<
Modified: trunk/lib/manip.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/manip.h?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/lib/manip.h (original)
+++ trunk/lib/manip.h Tue Dec 11 08:43:24 2007
@@ -409,7 +409,7 @@
}
-std::ostream&
+MYSQLPP_EXPORT std::ostream&
operator <<(do_nothing_type1 o, const SQLTypeAdapter& in);
Modified: trunk/lib/options.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/options.h?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/lib/options.h (original)
+++ trunk/lib/options.h Tue Dec 11 08:43:24 2007
@@ -54,7 +54,7 @@
///
/// This is the base class for the mid-level interface classes that take
/// arguments, plus the direct base for options that take no arguments.
-class Option
+class MYSQLPP_EXPORT Option
{
public:
/// \brief Types of option setting errors we can diagnose
@@ -73,7 +73,7 @@
/// \brief Define abstract interface for all *Options that take a
/// lone scalar as an argument.
template <typename T>
-class DataOption : public Option
+class MYSQLPP_EXPORT DataOption : public Option
{
public:
typedef T ArgType; ///<
Alias for template param
@@ -89,7 +89,7 @@
/// \brief Enable data compression on the connection
-class CompressOption : public Option
+class MYSQLPP_EXPORT CompressOption : public Option
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -102,7 +102,7 @@
/// \brief Change Connection::connect() default timeout
-class ConnectTimeoutOption : public IntegerOption
+class MYSQLPP_EXPORT ConnectTimeoutOption : public IntegerOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -117,7 +117,7 @@
/// \brief Make Query::affected_rows() return number of matched rows
///
/// Default is to return number of \b changed rows.
-class FoundRowsOption : public BooleanOption
+class MYSQLPP_EXPORT FoundRowsOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -133,7 +133,7 @@
///
/// This is the default. The option exists to override
/// UseEmbeddedConnectionOption and UseEmbeddedConnectionOption.
-class GuessConnectionOption : public Option
+class MYSQLPP_EXPORT GuessConnectionOption : public Option
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -146,7 +146,7 @@
/// \brief Allow spaces after function names in queries
-class IgnoreSpaceOption : public BooleanOption
+class MYSQLPP_EXPORT IgnoreSpaceOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -159,7 +159,7 @@
/// \brief Give SQL executed on connect
-class InitCommandOption : public StringOption
+class MYSQLPP_EXPORT InitCommandOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -174,7 +174,7 @@
/// \brief Assert that this is an interactive program
///
/// Affects connection timeouts.
-class InteractiveOption : public BooleanOption
+class MYSQLPP_EXPORT InteractiveOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -187,7 +187,7 @@
/// \brief Enable LOAD DATA LOCAL statement
-class LocalFilesOption : public BooleanOption
+class MYSQLPP_EXPORT LocalFilesOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -200,7 +200,7 @@
/// \brief Enable LOAD LOCAL INFILE statement
-class LocalInfileOption : public IntegerOption
+class MYSQLPP_EXPORT LocalInfileOption : public IntegerOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -213,7 +213,7 @@
/// \brief Enable multiple result sets in a reply
-class MultiResultsOption : public BooleanOption
+class MYSQLPP_EXPORT MultiResultsOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -226,7 +226,7 @@
/// \brief Enable multiple queries in a request to the server
-class MultiStatementsOption : public BooleanOption
+class MYSQLPP_EXPORT MultiStatementsOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -239,7 +239,7 @@
/// \brief Suggest use of named pipes
-class NamedPipeOption : public Option
+class MYSQLPP_EXPORT NamedPipeOption : public Option
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -252,7 +252,7 @@
/// \brief Disable db.tbl.col syntax in queries
-class NoSchemaOption : public BooleanOption
+class MYSQLPP_EXPORT NoSchemaOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -265,7 +265,7 @@
/// \brief Set type of protocol to use
-class ProtocolOption : public IntegerOption
+class MYSQLPP_EXPORT ProtocolOption : public IntegerOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -278,7 +278,7 @@
/// \brief Override use of my.cnf
-class ReadDefaultFileOption : public StringOption
+class MYSQLPP_EXPORT ReadDefaultFileOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -291,7 +291,7 @@
/// \brief Override use of my.cnf
-class ReadDefaultGroupOption : public StringOption
+class MYSQLPP_EXPORT ReadDefaultGroupOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -304,7 +304,7 @@
/// \brief Set timeout for IPC data reads
-class ReadTimeoutOption : public IntegerOption
+class MYSQLPP_EXPORT ReadTimeoutOption : public IntegerOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -317,7 +317,7 @@
/// \brief Enable automatic reconnection to server
-class ReconnectOption : public BooleanOption
+class MYSQLPP_EXPORT ReconnectOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -330,7 +330,7 @@
/// \brief Set reporting of data truncation errors
-class ReportDataTruncationOption : public BooleanOption
+class MYSQLPP_EXPORT ReportDataTruncationOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -344,7 +344,7 @@
/// \brief Enforce use of secure authentication, refusing connection if
/// not available
-class SecureAuthOption : public BooleanOption
+class MYSQLPP_EXPORT SecureAuthOption : public BooleanOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -357,7 +357,7 @@
/// \brief Give path to charset definition files
-class SetCharsetDirOption : public StringOption
+class MYSQLPP_EXPORT SetCharsetDirOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -370,7 +370,7 @@
/// \brief Give name of default charset
-class SetCharsetNameOption : public StringOption
+class MYSQLPP_EXPORT SetCharsetNameOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -383,7 +383,7 @@
/// \brief Fake client IP address when connecting to embedded server
-class SetClientIpOption : public StringOption
+class MYSQLPP_EXPORT SetClientIpOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -396,7 +396,7 @@
/// \brief Set name of shmem segment for IPC
-class SharedMemoryBaseNameOption : public StringOption
+class MYSQLPP_EXPORT SharedMemoryBaseNameOption : public StringOption
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -409,7 +409,7 @@
/// \brief Specialized option for handling SSL parameters.
-class SslOption : public Option
+class MYSQLPP_EXPORT SslOption : public Option
{
public:
/// \brief Create a set of SSL connection option parameters
@@ -442,7 +442,7 @@
/// \brief Connect to embedded server in preference to remote server
-class UseEmbeddedConnectionOption : public Option
+class MYSQLPP_EXPORT UseEmbeddedConnectionOption : public Option
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -455,7 +455,7 @@
/// \brief Connect to remote server in preference to embedded server
-class UseRemoteConnectionOption : public Option
+class MYSQLPP_EXPORT UseRemoteConnectionOption : public Option
{
#if !defined(DOXYGEN_IGNORE)
public:
@@ -468,7 +468,7 @@
/// \brief Set timeout for IPC data reads
-class WriteTimeoutOption : public IntegerOption
+class MYSQLPP_EXPORT WriteTimeoutOption : public IntegerOption
{
#if !defined(DOXYGEN_IGNORE)
public:
Modified: trunk/mysql++.bkl
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/mysql%2B%2B.bkl?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/mysql++.bkl (original)
+++ trunk/mysql++.bkl Tue Dec 11 08:43:24 2007
@@ -152,8 +152,8 @@
<lib-path>$(BUILD)</lib-path>
<include>$(MYSQL_WIN_DIR)\include</include>
<lib-path>$(MYSQL_WIN_DIR)\lib\opt</lib-path>
+ <sys-lib>mysqlpp</sys-lib>
<sys-lib>libmysql</sys-lib>
- <sys-lib>mysqlpp</sys-lib>
</if>
<if cond="FORMAT=='mingw'">
Modified: trunk/test/test_string.cpp
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/test/test_string.cpp?rev=2000&r1=1999&r2=2000&view=diff
==============================================================================
--- trunk/test/test_string.cpp (original)
+++ trunk/test/test_string.cpp Tue Dec 11 08:43:24 2007
@@ -42,6 +42,7 @@
std::cerr << "Type conversion to " << typeid(T).name() <<
" failed: \"" << s << "\" != \"" << value <<
"\"." <<
std::endl;
+ return false;
}
}
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
