mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-21 09:00:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

schema: specify the kind of join we want

Browse Source 
If we end up including more than one boost::<>::join, like
boost::range::join and boost::string::join, that will create an ambiguity.

The compiler doesn't like it very much.

Signed-off-by: Glauber Costa <glommer@cloudius-systems.com>
This commit is contained in:
Glauber Costa
2015-04-20 17:49:17 -04:00
parent a93f7e5525
commit 7677a3423e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
schema.hh
View File

@@ -202,9 +202,9 @@ public:
}
// Returns a range of column definitions
auto all_columns_in_select_order() const {
return boost::join(partition_key_columns(),
boost::join(clustering_key_columns(),
boost::join(static_columns(), regular_columns())));
return boost::range::join(partition_key_columns(),
boost::range::join(clustering_key_columns(),
boost::range::join(static_columns(), regular_columns())));
}
uint32_t position(const column_definition& column) const {
if (column.is_primary_key()) {