diff options
| author | Jeff Donahue <jeff.donahue@gmail.com> | 2014-02-26 08:49:27 -0800 |
|---|---|---|
| committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-02-26 16:54:25 -0800 |
| commit | 52a539dcd10de805def24ba2ace904089a9f1cd0 (patch) | |
| tree | 62ee79007152be7dff3709623638d98ade9d54ba /matlab | |
| parent | 5fdf55c437f7f94948af7d361a80e5b3d6d22e63 (diff) | |
| download | caffe-52a539dcd10de805def24ba2ace904089a9f1cd0.tar.gz caffe-52a539dcd10de805def24ba2ace904089a9f1cd0.tar.bz2 caffe-52a539dcd10de805def24ba2ace904089a9f1cd0.zip | |
fix python/matlab wrapper bugs introduced by lint; change linter->lint
in Makefile
Diffstat (limited to 'matlab')
| -rw-r--r-- | matlab/caffe/matcaffe.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/matlab/caffe/matcaffe.cpp b/matlab/caffe/matcaffe.cpp index d3bcba93..ddbacca1 100644 --- a/matlab/caffe/matcaffe.cpp +++ b/matlab/caffe/matcaffe.cpp @@ -12,7 +12,7 @@ #define MEX_ARGS int nlhs, mxArray **plhs, int nrhs, const mxArray **prhs -namespace caffe { +using namespace caffe; // NOLINT(build/namespaces) // The pointer to the internal caffe::Net instance static shared_ptr<Net<float> > net_; @@ -189,5 +189,3 @@ void mexFunction(MEX_ARGS) { mxFree(cmd); } } - -} // namespace caffe |