aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-10-29 14:39:12 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-10-29 14:39:12 +0200
commit1c6d6e5ed99e80d057a710635325a79b8e3f73d2 (patch)
tree8e1d4cb96520a33298cba35da654bc479c533d19
parent3c14b6b14f5921366868644bda0b512c4b673e47 (diff)
Add workaround for VC++2.2.0.a1
-rw-r--r--odb/no-id-object-result.hxx2
-rw-r--r--odb/polymorphic-object-result.hxx2
-rw-r--r--odb/result.hxx3
-rw-r--r--odb/simple-object-result.hxx2
-rw-r--r--odb/view-result.hxx2
5 files changed, 6 insertions, 5 deletions
diff --git a/odb/no-id-object-result.hxx b/odb/no-id-object-result.hxx
index 16df125..9404d82 100644
--- a/odb/no-id-object-result.hxx
+++ b/odb/no-id-object-result.hxx
@@ -42,7 +42,7 @@ namespace odb
friend class object_result_iterator<const T, void, false>;
protected:
- no_id_object_result_impl (connection& conn)
+ no_id_object_result_impl (odb::connection& conn)
: result_impl (conn), begin_ (true), end_ (false), current_ ()
{
}
diff --git a/odb/polymorphic-object-result.hxx b/odb/polymorphic-object-result.hxx
index 59592b1..b64812d 100644
--- a/odb/polymorphic-object-result.hxx
+++ b/odb/polymorphic-object-result.hxx
@@ -47,7 +47,7 @@ namespace odb
friend class object_result_iterator<const T, id_type, true>;
protected:
- polymorphic_object_result_impl (connection& conn)
+ polymorphic_object_result_impl (odb::connection& conn)
: result_impl (conn), begin_ (true), end_ (false), current_ ()
{
}
diff --git a/odb/result.hxx b/odb/result.hxx
index 9f590d0..5db08cd 100644
--- a/odb/result.hxx
+++ b/odb/result.hxx
@@ -12,11 +12,12 @@
#include <odb/forward.hxx>
#include <odb/traits.hxx>
+#include <odb/details/export.hxx>
#include <odb/details/shared-ptr.hxx>
namespace odb
{
- class result_impl: public details::shared_base
+ class LIBODB_EXPORT result_impl: public details::shared_base
{
public:
virtual
diff --git a/odb/simple-object-result.hxx b/odb/simple-object-result.hxx
index b0f3a9a..e094131 100644
--- a/odb/simple-object-result.hxx
+++ b/odb/simple-object-result.hxx
@@ -43,7 +43,7 @@ namespace odb
friend class object_result_iterator<const T, id_type, false>;
protected:
- object_result_impl (connection& conn)
+ object_result_impl (odb::connection& conn)
: result_impl (conn), begin_ (true), end_ (false), current_ ()
{
}
diff --git a/odb/view-result.hxx b/odb/view-result.hxx
index a07e5b8..289052e 100644
--- a/odb/view-result.hxx
+++ b/odb/view-result.hxx
@@ -37,7 +37,7 @@ namespace odb
typedef typename view_traits::pointer_type pointer_type;
typedef odb::pointer_traits<pointer_type> pointer_traits;
- view_result_impl (connection& conn)
+ view_result_impl (odb::connection& conn)
: result_impl (conn), begin_ (true), end_ (false), current_ ()
{
}