[Bf-blender-cvs] [151173fefe4] master: Libmv: Add array<type, size> to libmv namespace

Sergey Sharybin noreply at git.blender.org
Tue Oct 20 15:03:00 CEST 2020


Commit: 151173fefe498ac102fb7c861148782e6ec914b5
Author: Sergey Sharybin
Date:   Tue Oct 13 11:25:34 2020 +0200
Branches: master
https://developer.blender.org/rB151173fefe498ac102fb7c861148782e6ec914b5

Libmv: Add array<type, size> to libmv namespace

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

M	intern/libmv/CMakeLists.txt
A	intern/libmv/libmv/base/array.h

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

diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 5bb66649529..3e2ca8329a4 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -149,6 +149,7 @@ if(WITH_LIBMV)
     libmv/autotrack/region.h
     libmv/autotrack/tracks.h
     libmv/base/aligned_malloc.h
+    libmv/base/array.h
     libmv/base/id_generator.h
     libmv/base/map.h
     libmv/base/scoped_ptr.h
diff --git a/intern/libmv/libmv/base/array.h b/intern/libmv/libmv/base/array.h
new file mode 100644
index 00000000000..c165ece7c5b
--- /dev/null
+++ b/intern/libmv/libmv/base/array.h
@@ -0,0 +1,32 @@
+// 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_ARRAY_H_
+#define LIBMV_BASE_ARRAY_H_
+
+#include <array>
+
+namespace libmv {
+
+using std::array;
+
+}  // namespace libmv
+
+#endif  // LIBMV_BASE_ARRAY_H_



More information about the Bf-blender-cvs mailing list