summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Dumont <dumont.guillaume@gmail.com>2017-04-14 02:37:13 (GMT)
committerGuillaume Dumont <dumont.guillaume@gmail.com>2017-04-14 02:37:36 (GMT)
commitaa29eba26b781349174cb856b6ea96360ebbb3f2 (patch)
tree8894fd9bfd8722ac9a938f2f78c5a8980e1f69d6
parent0c9cc62379e4061b58b0dfa257d79c2ecaeb2be8 (diff)
downloadcaffe-aa29eba26b781349174cb856b6ea96360ebbb3f2.zip
caffe-aa29eba26b781349174cb856b6ea96360ebbb3f2.tar.gz
caffe-aa29eba26b781349174cb856b6ea96360ebbb3f2.tar.bz2
Explicit std::string to bp::object conversion
-rw-r--r--python/caffe/_caffe.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/caffe/_caffe.cpp b/python/caffe/_caffe.cpp
index 7fc06c0..d7f43ff 100644
--- a/python/caffe/_caffe.cpp
+++ b/python/caffe/_caffe.cpp
@@ -371,7 +371,7 @@ bp::object NCCL_New_Uid() {
return bp::object(bp::handle<>(py_uid));
#else
// automatic conversion is correct for python 2.
- return uid;
+ return bp::object(uid);
#endif
}
#endif