Author: mysqlpp
Date: Fri Mar 31 17:04:03 2006
New Revision: 1276
URL: http://svn.gna.org/viewcvs/mysqlpp?rev=1276&view=rev
Log:
Removed MYSQLPP_EXPORT tags from inline functions. This declares these
functions as __declspec(dllimport) when a program links against the
library as a Windows DLL, but inline functions don't go in the DLL.
VC++ copes with this "lie" without complaint, but MinGW's compiler
issues a warning.
Modified:
trunk/lib/manip.h
trunk/lib/result.h
trunk/lib/string_util.h
trunk/lib/type_info.h
Modified: trunk/lib/manip.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/manip.h?rev=1276&r1=1275&r2=1276&view=diff
==============================================================================
--- trunk/lib/manip.h (original)
+++ trunk/lib/manip.h Fri Mar 31 17:04:03 2006
@@ -91,7 +91,7 @@
};
-MYSQLPP_EXPORT inline quote_type1 operator <<(std::ostream& o,
+inline quote_type1 operator <<(std::ostream& o,
quote_type0 /*esc */)
{
return quote_type1(&o);
@@ -109,7 +109,7 @@
};
-MYSQLPP_EXPORT inline quote_type2 operator <<(SQLQueryParms& p,
+inline quote_type2 operator <<(SQLQueryParms& p,
quote_type0 /*esc */)
{
return quote_type2(&p);
@@ -164,7 +164,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_type1 o,
+inline std::ostream& operator <<(quote_type1 o,
char* const& in)
{
return operator <<(o, const_cast<const char* const&>(in));
@@ -172,7 +172,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_type1 o,
+inline std::ostream& operator <<(quote_type1 o,
const Date& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -180,7 +180,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_type1 o,
+inline std::ostream& operator <<(quote_type1 o,
const Time& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -188,7 +188,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_type1 o,
+inline std::ostream& operator <<(quote_type1 o,
const DateTime& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -231,7 +231,7 @@
};
-MYSQLPP_EXPORT inline quote_only_type1 operator <<(std::ostream& o,
+inline quote_only_type1 operator <<(std::ostream& o,
quote_only_type0 /* esc */)
{
return quote_only_type1(&o);
@@ -248,7 +248,7 @@
};
-MYSQLPP_EXPORT inline quote_only_type2 operator <<(SQLQueryParms& p,
+inline quote_only_type2 operator <<(SQLQueryParms& p,
quote_only_type0 /* esc */)
{
return quote_only_type2(&p);
@@ -266,7 +266,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_only_type1 o,
+inline std::ostream& operator <<(quote_only_type1 o,
const std::string& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -284,7 +284,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_only_type1 o,
+inline std::ostream& operator <<(quote_only_type1 o,
const Date& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -292,7 +292,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_only_type1 o,
+inline std::ostream& operator <<(quote_only_type1 o,
const Time& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -300,7 +300,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(quote_only_type1 o,
+inline std::ostream& operator <<(quote_only_type1 o,
const DateTime& in)
{
return *o.ostr << '\'' << in << '\'';
@@ -343,7 +343,7 @@
};
-MYSQLPP_EXPORT inline quote_double_only_type1 operator <<(
+inline quote_double_only_type1 operator <<(
std::ostream& o, quote_double_only_type0 /* esc */)
{
return quote_double_only_type1(&o);
@@ -360,7 +360,7 @@
};
-MYSQLPP_EXPORT inline quote_double_only_type2 operator <<(
+inline quote_double_only_type2 operator <<(
SQLQueryParms& p, quote_double_only_type0 /* esc */)
{
return quote_double_only_type2(&p);
@@ -379,7 +379,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(
+inline std::ostream& operator <<(
quote_double_only_type1 o, const std::string& in)
{
return *o.ostr << '"' << in << '"';
@@ -397,7 +397,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(
+inline std::ostream& operator <<(
quote_double_only_type1 o, const Date& in)
{
return *o.ostr << '"' << in << '"';
@@ -405,7 +405,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(
+inline std::ostream& operator <<(
quote_double_only_type1 o, const Time& in)
{
return *o.ostr << '"' << in << '"';
@@ -413,7 +413,7 @@
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(
+inline std::ostream& operator <<(
quote_double_only_type1 o, const DateTime& in)
{
return *o.ostr << '"' << in << '"';
@@ -453,7 +453,7 @@
};
-MYSQLPP_EXPORT inline escape_type1 operator <<(std::ostream& o,
+inline escape_type1 operator <<(std::ostream& o,
escape_type0 /*esc */)
{
return escape_type1(&o);
@@ -470,7 +470,7 @@
};
-MYSQLPP_EXPORT inline escape_type2 operator <<(SQLQueryParms& p,
+inline escape_type2 operator <<(SQLQueryParms& p,
escape_type0 /*esc */)
{
return escape_type2(&p);
@@ -534,7 +534,7 @@
/// const char* const&).
template <>
-MYSQLPP_EXPORT inline std::ostream& operator <<(escape_type1 o,
+inline std::ostream& operator <<(escape_type1 o,
char* const& in)
{
return operator <<(o, const_cast<const char* const&>(in));
@@ -571,7 +571,7 @@
};
-MYSQLPP_EXPORT inline do_nothing_type1 operator <<(std::ostream& o,
+inline do_nothing_type1 operator <<(std::ostream& o,
do_nothing_type0 /*esc */)
{
return do_nothing_type1(&o);
@@ -595,7 +595,7 @@
};
-MYSQLPP_EXPORT inline do_nothing_type2 operator <<(SQLQueryParms& p,
+inline do_nothing_type2 operator <<(SQLQueryParms& p,
do_nothing_type0 /* esc */)
{
return do_nothing_type2(&p);
@@ -637,7 +637,7 @@
};
-MYSQLPP_EXPORT inline ignore_type2 operator <<(SQLQueryParms& p,
+inline ignore_type2 operator <<(SQLQueryParms& p,
ignore_type0 /* esc*/)
{
return ignore_type2(&p);
Modified: trunk/lib/result.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/result.h?rev=1276&r1=1275&r2=1276&view=diff
==============================================================================
--- trunk/lib/result.h (original)
+++ trunk/lib/result.h Fri Mar 31 17:04:03 2006
@@ -216,75 +216,75 @@
/// \brief Get the index of the named field.
///
/// This is the inverse of field_name().
- MYSQLPP_EXPORT inline int field_num(const std::string&) const;
+ inline int field_num(const std::string&) const;
/// \brief Get the name of the field at the given index.
///
/// This is the inverse of field_num().
- MYSQLPP_EXPORT inline std::string& field_name(int);
+ inline std::string& field_name(int);
/// \brief Get the name of the field at the given index.
- MYSQLPP_EXPORT inline const std::string& field_name(int) const;
+ inline const std::string& field_name(int) const;
/// \brief Get the names of the fields within this result set.
- MYSQLPP_EXPORT inline FieldNames& field_names();
+ inline FieldNames& field_names();
/// \brief Get the names of the fields within this result set.
- MYSQLPP_EXPORT inline const FieldNames& field_names() const;
+ inline const FieldNames& field_names() const;
/// \brief Reset the names in the field list to their original
/// values.
- MYSQLPP_EXPORT inline void reset_field_names();
+ inline void reset_field_names();
/// \brief Get the MySQL type for a field given its index.
- MYSQLPP_EXPORT inline mysql_type_info& field_type(int i);
+ inline mysql_type_info& field_type(int i);
/// \brief Get the MySQL type for a field given its index.
- MYSQLPP_EXPORT inline const mysql_type_info& field_type(int) const;
+ inline const mysql_type_info& field_type(int) const;
/// \brief Get a list of the types of the fields within this
/// result set.
- MYSQLPP_EXPORT inline FieldTypes& field_types();
+ inline FieldTypes& field_types();
/// \brief Get a list of the types of the fields within this
/// result set.
- MYSQLPP_EXPORT inline const FieldTypes& field_types() const;
+ inline const FieldTypes& field_types() const;
/// \brief Reset the field types to their original values.
- MYSQLPP_EXPORT inline void reset_field_types();
+ inline void reset_field_types();
/// \brief Alias for field_num()
- MYSQLPP_EXPORT inline int names(const std::string & s) const;
+ inline int names(const std::string & s) const;
/// \brief Alias for field_name()
- MYSQLPP_EXPORT inline std::string& names(int i);
+ inline std::string& names(int i);
/// \brief Alias for field_name()
- MYSQLPP_EXPORT inline const std::string& names(int i) const;
+ inline const std::string& names(int i) const;
/// \brief Alias for field_names()
- MYSQLPP_EXPORT inline FieldNames& names();
+ inline FieldNames& names();
/// \brief Alias for field_names()
- MYSQLPP_EXPORT inline const FieldNames& names() const;
+ inline const FieldNames& names() const;
/// \brief Alias for reset_field_names()
- MYSQLPP_EXPORT inline void reset_names();
+ inline void reset_names();
/// \brief Alias for field_type()
- MYSQLPP_EXPORT inline mysql_type_info& types(int i);
+ inline mysql_type_info& types(int i);
/// \brief Alias for field_type()
- MYSQLPP_EXPORT inline const mysql_type_info& types(int i) const;
+ inline const mysql_type_info& types(int i) const;
/// \brief Alias for field_types()
- MYSQLPP_EXPORT inline FieldTypes& types();
+ inline FieldTypes& types();
/// \brief Alias for field_types()
- MYSQLPP_EXPORT inline const FieldTypes& types() const;
+ inline const FieldTypes& types() const;
/// \brief Alias for reset_field_types()
- MYSQLPP_EXPORT inline void reset_types();
+ inline void reset_types();
/// \brief Get the underlying Fields structure.
const Fields& fields() const
Modified: trunk/lib/string_util.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/string_util.h?rev=1276&r1=1275&r2=1276&view=diff
==============================================================================
--- trunk/lib/string_util.h (original)
+++ trunk/lib/string_util.h Fri Mar 31 17:04:03 2006
@@ -44,7 +44,7 @@
MYSQLPP_EXPORT extern void escape_string(std::string& s);
/// \brief Changes case of string to upper
-MYSQLPP_EXPORT inline void str_to_upr(std::string& s)
+inline void str_to_upr(std::string& s)
{
for (unsigned int cnt=0; cnt < s.length(); cnt++) {
char c = s[cnt]; s[cnt]=toupper(c);
@@ -52,7 +52,7 @@
}
/// \brief Changes case of string to lower
-MYSQLPP_EXPORT inline void str_to_lwr (std::string& s)
+inline void str_to_lwr (std::string& s)
{
for (unsigned int cnt=0; cnt < s.length(); cnt++) {
char c = s[cnt]; s[cnt]=tolower(c);
@@ -60,14 +60,14 @@
}
/// \brief Removes all blanks
-MYSQLPP_EXPORT inline void strip_all_blanks (std::string& s)
+inline void strip_all_blanks (std::string& s)
{
for (unsigned int counter=0;counter < s.size();counter++)
if (s[counter] == ' ') { s.erase(counter,1); counter--;}
}
/// \brief Removes all non-numerics
-MYSQLPP_EXPORT inline void strip_all_non_num (std::string& s)
+inline void strip_all_non_num (std::string& s)
{
for (unsigned int counter=0;counter < s.size();counter++)
if (!isdigit(s[counter])) { s.erase(counter,1); counter--;}
Modified: trunk/lib/type_info.h
URL:
http://svn.gna.org/viewcvs/mysqlpp/trunk/lib/type_info.h?rev=1276&r1=1275&r2=1276&view=diff
==============================================================================
--- trunk/lib/type_info.h (original)
+++ trunk/lib/type_info.h Fri Mar 31 17:04:03 2006
@@ -139,13 +139,13 @@
/// \param t the MySQL C API type ID for this type
/// \param _unsigned if true, this is the unsigned version of the type
/// \param _null if true, this type can hold a SQL null
- MYSQLPP_EXPORT inline mysql_type_info(enum_field_types t,
+ inline mysql_type_info(enum_field_types t,
bool _unsigned, bool _null);
/// \brief Create object from a MySQL C API field
///
/// \param f field from which we extract the type info
- MYSQLPP_EXPORT inline mysql_type_info(const MYSQL_FIELD& f);
+ inline mysql_type_info(const MYSQL_FIELD& f);
/// \brief Create object as a copy of another
mysql_type_info(const mysql_type_info& t) :
@@ -194,37 +194,37 @@
///
/// Returns the name that would be returned by typeid().name() for
/// the C++ type associated with the SQL type.
- MYSQLPP_EXPORT inline const char* name() const;
+ inline const char* name() const;
/// \brief Returns the name of the SQL type.
///
/// Returns the SQL name for the type.
- MYSQLPP_EXPORT inline const char* sql_name() const;
+ inline const char* sql_name() const;
/// \brief Returns the type_info for the C++ type associated with
/// the SQL type.
///
/// Returns the C++ type_info record corresponding to the SQL type.
- MYSQLPP_EXPORT inline const std::type_info& c_type() const;
+ inline const std::type_info& c_type() const;
/// \brief Return length of data in this field
///
/// This only works if you initialized this object from a
/// MYSQL_FIELD object.
- MYSQLPP_EXPORT inline const unsigned int length() const;
+ inline const unsigned int length() const;
/// \brief Return maximum length of data in this field
///
/// This only works if you initialized this object from a
/// MYSQL_FIELD object.
- MYSQLPP_EXPORT inline const unsigned int max_length() const;
+ inline const unsigned int max_length() const;
/// \brief Returns the type_info for the C++ type inside of the
/// mysqlpp::Null type.
///
/// Returns the type_info for the C++ type inside the mysqlpp::Null
/// type. If the type is not Null then this is the same as c_type().
- MYSQLPP_EXPORT inline const mysql_type_info base_type() const;
+ inline const mysql_type_info base_type() const;
/// \brief Returns the ID of the SQL type.
///
_______________________________________________
Mysqlpp-commits mailing list
[email protected]
https://mail.gna.org/listinfo/mysqlpp-commits
