[Bf-blender-cvs] [547f50b5e07] master: Libmv: Add map utility

[Sergey Sharybin]

Commit: 547f50b5e0736de662a7ecb1c2b31db34975efb7
Author: Sergey Sharybin
Date:   Fri May 15 11:08:18 2020 +0200
Branches: master
https://developer.blender.org/rB547f50b5e0736de662a7ecb1c2b31db34975efb7

Libmv: Add map utility

===================================================================

M	intern/libmv/CMakeLists.txt
M	intern/libmv/files.txt
A	intern/libmv/libmv/base/map.h

===================================================================

diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 1801751523a..c6078268512 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -150,6 +150,7 @@ if(WITH_LIBMV)
     libmv/autotrack/tracks.h
     libmv/base/aligned_malloc.h
     libmv/base/id_generator.h
+    libmv/base/map.h
     libmv/base/scoped_ptr.h
     libmv/base/vector.h
     libmv/base/vector_utils.h
diff --git a/intern/libmv/files.txt b/intern/libmv/files.txt
index 223066bb02f..0ec90ec041f 100644
--- a/intern/libmv/files.txt
+++ b/intern/libmv/files.txt
@@ -16,6 +16,7 @@ libmv/autotrack/tracks_test.cc
 libmv/base/aligned_malloc.cc
 libmv/base/aligned_malloc.h
 libmv/base/id_generator.h
+libmv/base/map.h
 libmv/base/scoped_ptr.h
 libmv/base/scoped_ptr_test.cc
 libmv/base/vector.h
diff --git a/intern/libmv/libmv/base/map.h b/intern/libmv/libmv/base/map.h
new file mode 100644
index 00000000000..88b720f17fe
--- /dev/null
+++ b/intern/libmv/libmv/base/map.h
@@ -0,0 +1,34 @@
+// Copyright (c) 2020 libmv authors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to
+// deal in the Software without restriction, including without limitation the
+// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+// sell copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+// IN THE SOFTWARE.
+
+#ifndef LIBMV_BASE_MAP_H
+#define LIBMV_BASE_MAP_H
+
+#include <map>
+#include <utility>
+
+namespace libmv {
+
+using std::map;
+using std::make_pair;
+
+}  // namespace libmv
+
+#endif  // LIBMV_BASE_MAP_H