From c72be11819614cca793e179ba9fb32cf0dbf11c7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 14 Feb 2011 12:23:49 +0200 Subject: Get rid of unnecessary virtual inheritance --- tests/cxx/serializer/complex/driver.cxx | 4 ++-- tests/cxx/serializer/union/driver.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/cxx') diff --git a/tests/cxx/serializer/complex/driver.cxx b/tests/cxx/serializer/complex/driver.cxx index 7b57b60..84886cc 100644 --- a/tests/cxx/serializer/complex/driver.cxx +++ b/tests/cxx/serializer/complex/driver.cxx @@ -13,7 +13,7 @@ using namespace std; using namespace test; -struct base_simpl: virtual base_sskel +struct base_simpl: base_sskel { virtual int x () @@ -63,7 +63,7 @@ private: base_simpl base_impl_; }; -struct root_simpl: virtual root_sskel +struct root_simpl: root_sskel { }; diff --git a/tests/cxx/serializer/union/driver.cxx b/tests/cxx/serializer/union/driver.cxx index dea8e7e..bf1bb3e 100644 --- a/tests/cxx/serializer/union/driver.cxx +++ b/tests/cxx/serializer/union/driver.cxx @@ -13,7 +13,7 @@ using namespace std; using namespace test; -struct int_bool_union_simpl: virtual int_bool_union_sskel +struct int_bool_union_simpl: int_bool_union_sskel { int_bool_union_simpl () : n_ (0) -- cgit v1.1