summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJeff Donahue <jeff.donahue@gmail.com>2014-02-25 17:35:38 -0800
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2014-02-26 15:42:39 -0800
commitc66937cafb140c07b214344707e909bb300d63f5 (patch)
treec3d4176df532d15045a73e0a2d8d0f09368195ae /include
parent5abaf5ea3036a3f3d1f5f4a71bdfd6968c0a8134 (diff)
downloadcaffeonacl-c66937cafb140c07b214344707e909bb300d63f5.tar.gz
caffeonacl-c66937cafb140c07b214344707e909bb300d63f5.tar.bz2
caffeonacl-c66937cafb140c07b214344707e909bb300d63f5.zip
fix post-rebase linter errors
Diffstat (limited to 'include')
-rw-r--r--include/caffe/util/io.hpp9
-rw-r--r--include/caffe/vision_layers.hpp9
2 files changed, 8 insertions, 10 deletions
diff --git a/include/caffe/util/io.hpp b/include/caffe/util/io.hpp
index b2d489ce..27d85652 100644
--- a/include/caffe/util/io.hpp
+++ b/include/caffe/util/io.hpp
@@ -3,16 +3,15 @@
#ifndef CAFFE_UTIL_IO_H_
#define CAFFE_UTIL_IO_H_
-#include <google/protobuf/message.h>
+#include <string>
-#include <boost/scoped_ptr.hpp>
+#include "google/protobuf/message.h"
#include "hdf5.h"
#include "hdf5_hl.h"
+#include "caffe/proto/caffe.pb.h"
-#include <string>
-
+#include "boost/scoped_ptr.hpp"
#include "caffe/blob.hpp"
-#include "caffe/proto/caffe.pb.h"
using std::string;
using ::google::protobuf::Message;
diff --git a/include/caffe/vision_layers.hpp b/include/caffe/vision_layers.hpp
index b6f607a1..fc2b17c2 100644
--- a/include/caffe/vision_layers.hpp
+++ b/include/caffe/vision_layers.hpp
@@ -3,14 +3,13 @@
#ifndef CAFFE_VISION_LAYERS_HPP_
#define CAFFE_VISION_LAYERS_HPP_
-#include <leveldb/db.h>
-#include <pthread.h>
-#include <boost/scoped_ptr.hpp>
+#include <vector>
+#include "leveldb/db.h"
+#include "pthread.h"
+#include "boost/scoped_ptr.hpp"
#include "hdf5.h"
-#include <vector>
-
#include "caffe/layer.hpp"
#include "caffe/proto/caffe.pb.h"