Merge pull request #9028 from alalek:dnn_experimental_namespace
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:37:04 +0000 (07:37 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 29 Jun 2017 07:37:04 +0000 (07:37 +0000)
1  2 
modules/dnn/src/caffe/caffe_importer.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/init.cpp
modules/dnn/src/precomp.hpp
modules/dnn/src/tensorflow/tf_importer.cpp
modules/dnn/src/torch/torch_importer.cpp

  //M*/
  
  #include "../precomp.hpp"
- using namespace cv;
- using namespace cv::dnn;
  
 -#if HAVE_PROTOBUF
 +#ifdef HAVE_PROTOBUF
  #include "caffe.pb.h"
  
  #include <iostream>
Simple merge
Simple merge
Simple merge
@@@ -10,10 -10,8 +10,8 @@@ Implementation of Tensorflow models par
  */
  
  #include "../precomp.hpp"
- using namespace cv;
- using namespace cv::dnn;
  
 -#if HAVE_PROTOBUF
 +#ifdef HAVE_PROTOBUF
  #include "graph.pb.h"
  
  #include <iostream>