From 6b76715e63d2c265a4c51c73f9019bc578f874cb Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 8 Oct 2012 14:47:57 +0200
Subject: Fix bug in transient inheritance handling

Also test that we can handle it for objects, composite values, and views.
---
 common/polymorphism/test6.hxx | 65 -------------------------------------------
 1 file changed, 65 deletions(-)
 delete mode 100644 common/polymorphism/test6.hxx

(limited to 'common/polymorphism/test6.hxx')

diff --git a/common/polymorphism/test6.hxx b/common/polymorphism/test6.hxx
deleted file mode 100644
index 9ecef40..0000000
--- a/common/polymorphism/test6.hxx
+++ /dev/null
@@ -1,65 +0,0 @@
-// file      : common/polymorphism/test6.hxx
-// copyright : Copyright (c) 2009-2012 Code Synthesis Tools CC
-// license   : GNU GPL v2; see accompanying LICENSE file
-
-#ifndef TEST6_HXX
-#define TEST6_HXX
-
-#include <string>
-#include <memory>
-
-#include <odb/core.hxx>
-#include <odb/callback.hxx>
-
-// Test polymorphism and callbacks.
-//
-#pragma db namespace table("t6_")
-namespace test6
-{
-  #pragma db object polymorphic pointer(std::auto_ptr)
-  struct root
-  {
-    virtual ~root () {}
-    root (): id (0) {}
-    root (unsigned long i, unsigned long n): id (i), num (n) {}
-
-    #pragma db id
-    unsigned long id;
-
-    unsigned long num;
-  };
-
-  #pragma db object callback(db_callback)
-  struct base: root
-  {
-    base () {}
-    base (unsigned long i, unsigned long n, const std::string& s)
-        : root (i, n), str (s) {}
-
-    std::string str;
-
-    void
-    db_callback (odb::callback_event, odb::database&);
-
-    void
-    db_callback (odb::callback_event, odb::database&) const;
-  };
-
-  #pragma db object callback(db_callback)
-  struct derived: base
-  {
-    derived () {}
-    derived (unsigned long i, unsigned long n, const std::string& s)
-        : base (i, n, s), dnum (n + 1), dstr (s + 'd') {}
-
-    unsigned long dnum;
-    std::string dstr;
-
-    std::auto_ptr<root> ptr;
-
-    void
-    db_callback (odb::callback_event, odb::database&) const;
-  };
-}
-
-#endif // TEST6_HXX
-- 
cgit v1.1