1 files changed, 15 insertions, 12 deletions
diff --git a/odb/relational/mysql/context.hxx b/odb/relational/mysql/context.hxx
index a54803d..159fe46 100644
--- a/odb/relational/mysql/context.hxx
+++ b/odb/relational/mysql/context.hxx
@@ -101,26 +101,29 @@ namespace relational
                           string const& type,
                           semantics::context&,
                           column_type_flags);
-    private:
-      struct data: base_context::data
-      {
-        data (std::ostream& os): base_context::data (os) {}
-      };
-
-    private:
-      data* data_;
 
     public:
+      virtual
+      ~context ();
+      context ();
+      context (std::ostream&, semantics::unit&, options_type const&);
+
       static context&
       current ()
       {
-        return dynamic_cast<context&> (base_context::current ());
+        return *current_;
       }
 
-      context (std::ostream&, semantics::unit&, options_type const&);
+    private:
+      static context* current_;
 
-    protected:
-      context ();
+    private:
+      struct data: base_context::data
+      {
+        data (std::ostream& os): base_context::data (os) {}
+      };
+
+      data* data_;
     };
   }
 }