cpplint

diff --git a/src/caffe/common.hpp b/src/caffe/common.hpp
index c9b9f65e64ae8e355121766e1039c93afc77371a..67177a664b5ce88d766015148df30285a41858ca 100644 (file)
--- a/src/caffe/common.hpp
+++ b/src/caffe/common.hpp
@@ -7,7 +7,7 @@
 #include <cublas_v2.h>
 #include <cuda.h>
 #include <curand.h>
-//cuda driver types
+// cuda driver types
 #include <driver_types.h>
 #include <glog/logging.h>
 #include <mkl_vsl.h>

diff --git a/src/caffe/syncedmem.cpp b/src/caffe/syncedmem.cpp
index 8e6996d64fbf9f46d29f136c317855acec3dba0d..c991d8d84cb88fcbf24a6173725fff41d7cea262 100644 (file)
--- a/src/caffe/syncedmem.cpp
+++ b/src/caffe/syncedmem.cpp
@@ -1,8 +1,9 @@
 // Copyright 2013 Yangqing Jia
 
-#include <cstring>
 #include <cuda_runtime.h>
 
+#include <cstring>
+
 #include "caffe/common.hpp"
 #include "caffe/syncedmem.hpp"
 

diff --git a/src/caffe/vision_layers.hpp b/src/caffe/vision_layers.hpp
index 4744a95296fa5a1b29f0a938575ce77f4782c26d..336ed0fd516cb91f8dcb4dfdaa4e5fa3b71c2fbf 100644 (file)
--- a/src/caffe/vision_layers.hpp
+++ b/src/caffe/vision_layers.hpp
@@ -5,6 +5,8 @@
 
 #include <leveldb/db.h>
 
+#include <vector>
+
 #include "caffe/layer.hpp"
 
 namespace caffe {
@@ -15,7 +17,7 @@ template <typename Dtype>
 class NeuronLayer : public Layer<Dtype> {
  public:
   explicit NeuronLayer(const LayerParameter& param)
-     : Layer<Dtype>(param) {};
+     : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
 };
@@ -25,7 +27,8 @@ template <typename Dtype>
 class ReLULayer : public NeuronLayer<Dtype> {
  public:
   explicit ReLULayer(const LayerParameter& param)
-      : NeuronLayer<Dtype>(param) {};
+      : NeuronLayer<Dtype>(param) {}
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -43,9 +46,10 @@ template <typename Dtype>
 class DropoutLayer : public NeuronLayer<Dtype> {
  public:
   explicit DropoutLayer(const LayerParameter& param)
-      : NeuronLayer<Dtype>(param) {};
+      : NeuronLayer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -67,9 +71,10 @@ template <typename Dtype>
 class InnerProductLayer : public Layer<Dtype> {
  public:
   explicit InnerProductLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -91,9 +96,10 @@ template <typename Dtype>
 class PaddingLayer : public Layer<Dtype> {
  public:
   explicit PaddingLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -116,9 +122,10 @@ template <typename Dtype>
 class LRNLayer : public Layer<Dtype> {
  public:
   explicit LRNLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -144,9 +151,10 @@ template <typename Dtype>
 class Im2colLayer : public Layer<Dtype> {
  public:
   explicit Im2colLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -167,9 +175,10 @@ template <typename Dtype>
 class PoolingLayer : public Layer<Dtype> {
  public:
   explicit PoolingLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -192,9 +201,10 @@ template <typename Dtype>
 class ConvolutionLayer : public Layer<Dtype> {
  public:
   explicit ConvolutionLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
@@ -226,9 +236,10 @@ template <typename Dtype>
 class DataLayer : public Layer<Dtype> {
  public:
   explicit DataLayer(const LayerParameter& param)
-      : Layer<Dtype>(param) {};
+      : Layer<Dtype>(param) {}
   virtual void SetUp(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);
+
  protected:
   virtual void Forward_cpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top);