Merge "Fix build break in ubuntu1604 due to boost bind in uve aggrega…

…tor. Closes-Bug:1671313"
Juniper · Mar 9, 2017 · bfbe0a9 · bfbe0a9
2 parents 63fed3c + 2de7791
commit bfbe0a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/analytics/kafka_processor.cc b/src/analytics/kafka_processor.cc
@@ -536,7 +536,9 @@ KafkaProcessor::StartKafka(void) {
         ss << it->first;
         aggs.insert(make_pair(ss.str(),
                 new UVEAggregator(it->first, it->second,
-                        boost::bind(&RdKafka::KafkaConsumer::commitSync,
+                        boost::bind(static_cast<
+                            RdKafka::ErrorCode (RdKafka::KafkaConsumer::*)(RdKafka::Message*)>
+                            (&RdKafka::KafkaConsumer::commitSync),
                                     consumer, _1),
                         SandeshUVETypeMaps::kProxyPartitions)));
     }

diff --git a/src/analytics/uve_aggregator.h b/src/analytics/uve_aggregator.h
@@ -25,7 +25,7 @@ class UVEAggregator {
 public:
     static const uint64_t kCommitPeriod_us = 3600000000;
 
-    typedef boost::function<int32_t (RdKafka::Message *message)> commitCb;
+    typedef boost::function<RdKafka::ErrorCode (RdKafka::Message *message)> commitCb;
     UVEAggregator(const std::string& proxy, const std::string& conf,
             commitCb commit_cb, uint64_t partitions):
             topic_(proxy),