Merge pull request #6388 from open-cv/fix-6387

fix missing syncedmem constness fix issue #6387
chuckcho · Jun 6, 2018 · 05a1436 · 05a1436
2 parents 8645207 + 0536720
commit 05a1436
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/caffe/syncedmem.hpp b/include/caffe/syncedmem.hpp
@@ -66,8 +66,8 @@ class SyncedMemory {
  void* mutable_cpu_data();
  void* mutable_gpu_data();
  enum SyncedHead { UNINITIALIZED, HEAD_AT_CPU, HEAD_AT_GPU, SYNCED };
- SyncedHead head() { return head_; }
- size_t size() { return size_; }
+ SyncedHead head() const { return head_; }
+ size_t size() const { return size_; }
 
 #ifndef CPU_ONLY
  void async_gpu_push(const cudaStream_t& stream);