From af26563b3ea3a8b27cda930cc700893356353bb8 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 24 Jan 2011 14:39:49 +0200 Subject: Rename type to avoid conflict with member --- common/composite/test.hxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/composite/test.hxx b/common/composite/test.hxx index 08497c8..bd50cdc 100644 --- a/common/composite/test.hxx +++ b/common/composite/test.hxx @@ -18,7 +18,7 @@ struct name }; #pragma db value -struct title +struct name_title { std::string title; }; @@ -31,7 +31,7 @@ struct name_flags }; #pragma db value -struct name_ex: name, title +struct name_ex: name, name_title { name alias; std::string nick; -- cgit v1.1