Author: wyoung
Date: Sat Jan 6 05:04:47 2007
New Revision: 1346
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1346&view=rev
Log:
Revision 1314 DLL linkage fix (MYSQLPP_EXPORT on classes only, not on
each individual method, required for MinGW) broke VC++ by over-reaching.
This should redress the balance without re-breaking MinGW.
Modified:
trunk/lib/datetime.h
trunk/lib/manip.h
trunk/lib/resiter.h
Modified: trunk/lib/datetime.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/datetime.h?rev=1346&r1=1345&r2=1346&view=diff
==============================================================================
--- trunk/lib/datetime.h (original)
+++ trunk/lib/datetime.h Sat Jan 6 05:04:47 2007
@@ -65,7 +65,7 @@
///
/// Returns < 0 if this object is "before" the other, 0 of they are
/// equal, and > 0 if this object is "after" the other.
- virtual short compare(const T& other) const = 0;
+ MYSQLPP_EXPORT virtual short compare(const T& other) const = 0;
/// \brief Returns true if "other" is equal to this object
bool operator ==(const T& other) const
@@ -187,13 +187,13 @@
///
/// This method is protected because it is merely the engine used
/// by the various operators in DTbase.
- short compare(const DateTime& other) const;
+ MYSQLPP_EXPORT short compare(const DateTime& other) const;
/// \brief Parse a MySQL date and time string into this object.
- cchar* convert(cchar*);
-
- /// Convert to time_t
- operator time_t() const;
+ MYSQLPP_EXPORT cchar* convert(cchar*);
+
+ /// Convert to time_t
+ operator time_t() const;
};
@@ -279,10 +279,10 @@
///
/// Returns < 0 if this date is before the other, 0 of they are
/// equal, and > 0 if this date is after the other.
- short int compare(const Date& other) const;
+ MYSQLPP_EXPORT short int compare(const Date& other) const;
/// \brief Parse a MySQL date string into this object.
- cchar* convert(cchar*);
+ MYSQLPP_EXPORT cchar* convert(cchar*);
};
/// \brief Inserts a Date object into a C++ stream
@@ -359,13 +359,13 @@
}
/// \brief Parse a MySQL time string into this object.
- cchar* convert(cchar*);
+ MYSQLPP_EXPORT cchar* convert(cchar*);
/// \brief Compare this time to another.
///
/// Returns < 0 if this time is before the other, 0 of they are
/// equal, and > 0 if this time is after the other.
- short int compare(const Time& other) const;
+ MYSQLPP_EXPORT short int compare(const Time& other) const;
};
/// \brief Inserts a Time object into a C++ stream in a MySQL-compatible
Modified: trunk/lib/manip.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/manip.h?rev=1346&r1=1345&r2=1346&view=diff
==============================================================================
--- trunk/lib/manip.h (original)
+++ trunk/lib/manip.h Sat Jan 6 05:04:47 2007
@@ -57,7 +57,7 @@
/// so there is a serious danger of conflicts.
namespace mysqlpp {
-class MYSQLPP_EXPORT Query;
+class Query;
extern bool dont_quote_auto;
@@ -98,7 +98,7 @@
}
-class MYSQLPP_EXPORT SQLQueryParms;
+class SQLQueryParms;
struct quote_type2
{
SQLQueryParms *qparms;
@@ -254,7 +254,7 @@
return quote_only_type2(&p);
}
-SQLQueryParms& operator <<(quote_only_type2 p,
+MYSQLPP_EXPORT SQLQueryParms& operator <<(quote_only_type2 p,
SQLString& in);
@@ -274,12 +274,12 @@
template <>
-std::ostream& operator <<(quote_only_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(quote_only_type1 o,
const ColData_Tmpl<std::string>& in);
template <>
-std::ostream& operator <<(quote_only_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(quote_only_type1 o,
const ColData_Tmpl<const_string>& in);
@@ -367,7 +367,7 @@
}
-SQLQueryParms& operator <<(quote_double_only_type2 p,
+MYSQLPP_EXPORT SQLQueryParms& operator <<(quote_double_only_type2 p,
SQLString& in);
@@ -387,12 +387,12 @@
template <>
-std::ostream& operator <<(quote_double_only_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(quote_double_only_type1 o,
const ColData_Tmpl<std::string>& in);
template <>
-std::ostream & operator <<(quote_double_only_type1 o,
+MYSQLPP_EXPORT std::ostream & operator <<(quote_double_only_type1 o,
const ColData_Tmpl<const_string>& in);
@@ -507,22 +507,22 @@
template <>
-std::ostream& operator <<(escape_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(escape_type1 o,
const std::string& in);
template <>
-std::ostream& operator <<(escape_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(escape_type1 o,
const char* const& in);
template <>
-std::ostream& operator <<(escape_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(escape_type1 o,
const ColData_Tmpl<std::string>& in);
template <>
-std::ostream& operator <<(escape_type1 o,
+MYSQLPP_EXPORT std::ostream& operator <<(escape_type1 o,
const ColData_Tmpl<const_string>& in);
@@ -602,7 +602,7 @@
}
-SQLQueryParms& operator <<(do_nothing_type2 p,
+MYSQLPP_EXPORT SQLQueryParms& operator <<(do_nothing_type2 p,
SQLString& in);
#endif // !defined(DOXYGEN_IGNORE)
@@ -644,7 +644,7 @@
}
-SQLQueryParms& operator <<(ignore_type2 p,
+MYSQLPP_EXPORT SQLQueryParms& operator <<(ignore_type2 p,
SQLString& in);
#endif // !defined(DOXYGEN_IGNORE)
Modified: trunk/lib/resiter.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/resiter.h?rev=1346&r1=1345&r2=1346&view=diff
==============================================================================
--- trunk/lib/resiter.h (original)
+++ trunk/lib/resiter.h Sat Jan 6 05:04:47 2007
@@ -53,7 +53,7 @@
class ReturnType = const ValueType&,
class SizeType = unsigned int,
class DiffType = int>
-class MYSQLPP_EXPORT const_subscript_container
+class const_subscript_container
{
public:
typedef const_subscript_container<OnType, ValueType, ReturnType,
@@ -116,7 +116,7 @@
template <class OnType, class ReturnType, class SizeType,
class DiffType>
-class MYSQLPP_EXPORT subscript_iterator : public std::iterator<ReturnType,
SizeType>
+class subscript_iterator : public std::iterator<ReturnType, SizeType>
{
public:
/// \brief Default constructor
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
