From 7677a3423e49acdeae879c47e4e185486eb73708 Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Mon, 20 Apr 2015 17:49:17 -0400 Subject: [PATCH] schema: specify the kind of join we want 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 --- schema.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema.hh b/schema.hh index bcfc33a210..d2535bd833 100644 --- a/schema.hh +++ b/schema.hh @@ -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()) {