move using statements inside namespace caffe to avoid polluting the whole name space.

diff --git a/include/caffe/layer.hpp b/include/caffe/layer.hpp
index d4d10aa..3e386b3 100644 (file)
--- a/include/caffe/layer.hpp
+++ b/include/caffe/layer.hpp
@@ -10,11 +10,11 @@
 #include "caffe/common.hpp"
 #include "caffe/proto/caffe.pb.h"
 
+namespace caffe {
+
 using std::string;
 using std::vector;
 
-namespace caffe {
-
 template <typename Dtype>
 class Layer {
  public:

diff --git a/include/caffe/net.hpp b/include/caffe/net.hpp
index cbd5bec..ce82e28 100644 (file)
--- a/include/caffe/net.hpp
+++ b/include/caffe/net.hpp
@@ -14,15 +14,14 @@
 #include "caffe/layer.hpp"
 #include "caffe/proto/caffe.pb.h"
 
+namespace caffe {
+
 using std::map;
 using std::pair;
 using std::set;
 using std::string;
 using std::vector;
 
-namespace caffe {
-
-
 template <typename Dtype>
 class Net {
  public:

diff --git a/include/caffe/util/insert_splits.hpp b/include/caffe/util/insert_splits.hpp
index e25cdd7..45c3a05 100644 (file)
--- a/include/caffe/util/insert_splits.hpp
+++ b/include/caffe/util/insert_splits.hpp
@@ -7,11 +7,11 @@
 
 #include "caffe/proto/caffe.pb.h"
 
+namespace caffe {
+
 using std::pair;
 using std::string;
 
-namespace caffe {
-
 // Copy NetParameters with SplitLayers added to replace any shared bottom
 // blobs with unique bottom blobs provided by the SplitLayer.
 void InsertSplits(const NetParameter& param, NetParameter* param_split);

diff --git a/include/caffe/util/io.hpp b/include/caffe/util/io.hpp
index 4458096..accb094 100644 (file)
--- a/include/caffe/util/io.hpp
+++ b/include/caffe/util/io.hpp
@@ -12,13 +12,13 @@
 
 #include "caffe/blob.hpp"
 
-using std::string;
-using ::google::protobuf::Message;
-
 #define HDF5_NUM_DIMS 4
 
 namespace caffe {
 
+using std::string;
+using ::google::protobuf::Message;
+
 bool ReadProtoFromTextFile(const char* filename, Message* proto);
 
 inline bool ReadProtoFromTextFile(const string& filename, Message* proto) {

diff --git a/include/caffe/util/upgrade_proto.hpp b/include/caffe/util/upgrade_proto.hpp
index a1ac060..0772f80 100644 (file)
--- a/include/caffe/util/upgrade_proto.hpp
+++ b/include/caffe/util/upgrade_proto.hpp
@@ -8,10 +8,10 @@
 #include "caffe/proto/caffe.pb.h"
 #include "caffe/proto/caffe_pretty_print.pb.h"
 
-using std::string;
-
 namespace caffe {
 
+using std::string;
+
 // Return true iff any layer contains parameters specified using
 // deprecated V0LayerParameter.
 bool NetNeedsUpgrade(const NetParameter& net_param);

diff --git a/src/caffe/layer_factory.cpp b/src/caffe/layer_factory.cpp
index d6e506d..173c870 100644 (file)
--- a/src/caffe/layer_factory.cpp
+++ b/src/caffe/layer_factory.cpp
@@ -9,10 +9,9 @@
 #include "caffe/vision_layers.hpp"
 #include "caffe/proto/caffe.pb.h"
 
-using std::string;
-
 namespace caffe {
 
+using std::string;
 
 // A function to get a specific layer from the specification given in
 // LayerParameter. Ideally this would be replaced by a factory pattern,

diff --git a/src/caffe/layers/accuracy_layer.cpp b/src/caffe/layers/accuracy_layer.cpp
index 4099655..ddfe38a 100644 (file)
--- a/src/caffe/layers/accuracy_layer.cpp
+++ b/src/caffe/layers/accuracy_layer.cpp
@@ -10,10 +10,11 @@
 #include "caffe/util/math_functions.hpp"
 #include "caffe/util/io.hpp"
 
-using std::max;
 
 namespace caffe {
 
+using std::max;
+
 template <typename Dtype>
 void AccuracyLayer<Dtype>::SetUp(
   const vector<Blob<Dtype>*>& bottom, vector<Blob<Dtype>*>* top) {

diff --git a/src/caffe/layers/bnll_layer.cpp b/src/caffe/layers/bnll_layer.cpp
index 95e6bd8..a00de9e 100644 (file)
--- a/src/caffe/layers/bnll_layer.cpp
+++ b/src/caffe/layers/bnll_layer.cpp
@@ -6,10 +6,10 @@
 #include "caffe/layer.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::min;
-
 namespace caffe {
 
+using std::min;
+
 const float kBNLL_THRESHOLD = 50.;
 
 template <typename Dtype>

diff --git a/src/caffe/layers/bnll_layer.cu b/src/caffe/layers/bnll_layer.cu
index 7849d11..8fbe7f7 100644 (file)
--- a/src/caffe/layers/bnll_layer.cu
+++ b/src/caffe/layers/bnll_layer.cu
@@ -6,10 +6,10 @@
 #include "caffe/layer.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::max;
-
 namespace caffe {
 
+using std::max;
+
 const float kBNLL_THRESHOLD = 50.;
 
 template <typename Dtype>

diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp
index 29c4fec..5ff1a44 100644 (file)
--- a/src/caffe/layers/data_layer.cpp
+++ b/src/caffe/layers/data_layer.cpp
@@ -14,8 +14,6 @@
 #include "caffe/vision_layers.hpp"
 #include "caffe/proto/caffe.pb.h"
 
-using std::string;
-
 namespace caffe {
 
 template <typename Dtype>

diff --git a/src/caffe/layers/data_layer.cu b/src/caffe/layers/data_layer.cu
index 40316a1..4409f47 100644 (file)
--- a/src/caffe/layers/data_layer.cu
+++ b/src/caffe/layers/data_layer.cu
@@ -11,8 +11,6 @@
 #include "caffe/util/io.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::string;
-
 namespace caffe {
 
 template <typename Dtype>

diff --git a/src/caffe/layers/hdf5_data_layer.cu b/src/caffe/layers/hdf5_data_layer.cu
index 3c27f37..d50d961 100644 (file)
--- a/src/caffe/layers/hdf5_data_layer.cu
+++ b/src/caffe/layers/hdf5_data_layer.cu
@@ -15,8 +15,6 @@ TODO:
 #include "caffe/util/io.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::string;
-
 namespace caffe {
 
 template <typename Dtype>

diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp
index 1f7368e..90ecadf 100644 (file)
--- a/src/caffe/layers/image_data_layer.cpp
+++ b/src/caffe/layers/image_data_layer.cpp
@@ -16,12 +16,11 @@
 #include "caffe/util/rng.hpp"
 #include "caffe/vision_layers.hpp"
 
+namespace caffe {
+
 using std::iterator;
-using std::string;
 using std::pair;
 
-namespace caffe {
-
 template <typename Dtype>
 void* ImageDataLayerPrefetch(void* layer_pointer) {
   CHECK(layer_pointer);

diff --git a/src/caffe/layers/image_data_layer.cu b/src/caffe/layers/image_data_layer.cu
index dd5bdbc..2b8c8ed 100644 (file)
--- a/src/caffe/layers/image_data_layer.cu
+++ b/src/caffe/layers/image_data_layer.cu
@@ -16,11 +16,10 @@
 #include "caffe/util/io.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::string;
-using std::pair;
-
 namespace caffe {
 
+using std::pair;
+
 template <typename Dtype>
 Dtype ImageDataLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top) {

diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp
index 5dbdff3..53467e8 100644 (file)
--- a/src/caffe/layers/window_data_layer.cpp
+++ b/src/caffe/layers/window_data_layer.cpp
@@ -22,16 +22,15 @@
 #include "caffe/util/rng.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::string;
-using std::map;
-using std::pair;
-
 // caffe.proto > LayerParameter > WindowDataParameter
 //   'source' field specifies the window_file
 //   'crop_size' indicates the desired warped size
 
 namespace caffe {
 
+using std::map;
+using std::pair;
+
 template <typename Dtype>
 void* WindowDataLayerPrefetch(void* layer_pointer) {
   WindowDataLayer<Dtype>* layer =

diff --git a/src/caffe/layers/window_data_layer.cu b/src/caffe/layers/window_data_layer.cu
index ca664fc..d4efeca 100644 (file)
--- a/src/caffe/layers/window_data_layer.cu
+++ b/src/caffe/layers/window_data_layer.cu
@@ -12,16 +12,15 @@
 #include "caffe/util/io.hpp"
 #include "caffe/vision_layers.hpp"
 
-using std::string;
-using std::map;
-using std::pair;
-
 // caffe.proto > LayerParameter > WindowDataParameter
 //   'source' field specifies the window_file
 //   'crop_size' indicates the desired warped size
 
 namespace caffe {
 
+using std::map;
+using std::pair;
+
 template <typename Dtype>
 Dtype WindowDataLayer<Dtype>::Forward_gpu(const vector<Blob<Dtype>*>& bottom,
       vector<Blob<Dtype>*>* top) {