From: Jeff Donahue <jeff.donahue@gmail.com>
Date: Mon, 21 Jul 2014 17:25:59 +0000 (-0700)
Subject: Merge pull request #752 from Yangqing/sweep
X-Git-Tag: submit/tizen/20180823.020014~653^2~53
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24e92e13925feb027fc88515657778532254e513;p=platform%2Fupstream%2Fcaffeonacl.git

Merge pull request #752 from Yangqing/sweep

reapply namespace change
---

24e92e13925feb027fc88515657778532254e513
diff --cc src/caffe/layers/accuracy_layer.cpp
index 58ea6ae,95439b9..7c91311
--- a/src/caffe/layers/accuracy_layer.cpp
+++ b/src/caffe/layers/accuracy_layer.cpp
@@@ -10,10 -10,9 +10,8 @@@
  #include "caffe/util/math_functions.hpp"
  #include "caffe/util/io.hpp"
  
 -
  namespace caffe {
  
- using std::max;
- 
  template <typename Dtype>
  void AccuracyLayer<Dtype>::SetUp(
    const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) {