lint

diff --git a/src/caffe/layers/multinomial_logistic_loss_layer.cpp b/src/caffe/layers/multinomial_logistic_loss_layer.cpp
index 013d403..dd5cae4 100644 (file)
--- a/src/caffe/layers/multinomial_logistic_loss_layer.cpp
+++ b/src/caffe/layers/multinomial_logistic_loss_layer.cpp
@@ -35,7 +35,7 @@ Dtype MultinomialLogisticLossLayer<Dtype>::Forward_cpu(
     Dtype prob = max(bottom_data[i * dim + label], Dtype(kLOG_THRESHOLD));
     loss -= log(prob);
   }
-  if (top->size() == 1){
+  if (top->size() == 1) {
     (*top)[0]->mutable_cpu_data()[0] = loss / num;
   }
   return loss / num;

diff --git a/src/caffe/net.cpp b/src/caffe/net.cpp
index f364e67..c0f124b 100644 (file)
--- a/src/caffe/net.cpp
+++ b/src/caffe/net.cpp
@@ -3,6 +3,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "caffe/common.hpp"

diff --git a/tools/compute_image_mean.cpp b/tools/compute_image_mean.cpp
index 5b212b6..a7cbc8b 100644 (file)
--- a/tools/compute_image_mean.cpp
+++ b/tools/compute_image_mean.cpp
@@ -53,7 +53,7 @@ int main(int argc, char** argv) {
   } else if (db_backend == "lmdb") {  // lmdb
     LOG(INFO) << "Opening lmdb " << argv[1];
     CHECK_EQ(mdb_env_create(&mdb_env), MDB_SUCCESS) << "mdb_env_create failed";
-    CHECK_EQ(mdb_env_set_mapsize(mdb_env, 1099511627776), MDB_SUCCESS); // 1TB
+    CHECK_EQ(mdb_env_set_mapsize(mdb_env, 1099511627776), MDB_SUCCESS);  // 1TB
     CHECK_EQ(mdb_env_open(mdb_env, argv[1], MDB_RDONLY, 0664),
         MDB_SUCCESS) << "mdb_env_open failed";
     CHECK_EQ(mdb_txn_begin(mdb_env, NULL, MDB_RDONLY, &mdb_txn), MDB_SUCCESS)