Merge pull request BVLC#3770 from BlGene/lint_fix

Removed lint script reference to non-existant caffe_memcpy function.
MeJn · Mar 5, 2016 · 6a0b987 · 6a0b987
2 parents a1c81ac + db7a261
commit 6a0b987
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/scripts/cpp_lint.py b/scripts/cpp_lint.py
@@ -1564,7 +1564,7 @@ def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error):
 caffe_alt_function_list = (
     ('memset', ['caffe_set', 'caffe_memset']),
     ('cudaMemset', ['caffe_gpu_set', 'caffe_gpu_memset']),
-    ('memcpy', ['caffe_copy', 'caffe_memcpy']),
+    ('memcpy', ['caffe_copy']),
     ('cudaMemcpy', ['caffe_copy', 'caffe_gpu_memcpy']),
     )