From 2d1f95de873542ae591b4575e14539f26945b162 Mon Sep 17 00:00:00 2001
From: fengjiayi <fengjiayi@baidu.com>
Date: Mon, 3 Jul 2017 19:33:33 +0800
Subject: [PATCH] fix a compile error

---
 paddle/framework/tensor.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/paddle/framework/tensor.h b/paddle/framework/tensor.h
index f777661a1cd..6a152f6a6d7 100644
--- a/paddle/framework/tensor.h
+++ b/paddle/framework/tensor.h
@@ -37,8 +37,10 @@ class Tensor {
   template <typename T,  // must be POD types
             typename std::enable_if<std::is_pod<T>::value>::type* = nullptr>
   T* mutable_data(DDim dims, paddle::platform::Place place) {
-    if (holder_ == nullptr || holder_->Place() != place ||
-        holder_->Size() < product(dims) * sizeof(T)) {
+    if (holder_ == nullptr ||
+        !(holder_->Place() ==
+          place) /* some versions of boost::variant don't have operator!= */
+        || holder_->Size() < product(dims) * sizeof(T)) {
       holder_.reset(new PlaceholderImpl<T>(place, product(dims) * sizeof(T)));
     }
     return static_cast<T*>(holder_->Ptr());
-- 
GitLab