aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-01-24 14:39:49 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-01-24 14:39:49 +0200
commitaf26563b3ea3a8b27cda930cc700893356353bb8 (patch)
tree64f55085505af41d3a4689032f21f0c70ee48d08 /common
parent5b721648eb7cd159863f88f9e4a53298d790b1e4 (diff)
Rename type to avoid conflict with member
Diffstat (limited to 'common')
-rw-r--r--common/composite/test.hxx4
1 files 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;