projects
/
platform
/
upstream
/
caffe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
19028e7
)
Functions shall return a value in syncedmem
author
Tea
<tea.desouza@gmail.com>
Thu, 12 Nov 2015 07:55:06 +0000
(15:55 +0800)
committer
Tea
<tea.desouza@gmail.com>
Thu, 12 Nov 2015 08:04:21 +0000
(16:04 +0800)
src/caffe/syncedmem.cpp
patch
|
blob
|
history
diff --git
a/src/caffe/syncedmem.cpp
b/src/caffe/syncedmem.cpp
index
ec4665e
..
4d35641
100644
(file)
--- a/
src/caffe/syncedmem.cpp
+++ b/
src/caffe/syncedmem.cpp
@@
-97,6
+97,7
@@
const void* SyncedMemory::gpu_data() {
return (const void*)gpu_ptr_;
#else
NO_GPU;
+ return NULL;
#endif
}
@@
-133,6
+134,7
@@
void* SyncedMemory::mutable_gpu_data() {
return gpu_ptr_;
#else
NO_GPU;
+ return NULL;
#endif
}