Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-26 18:35:58 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-01-27 14:19:49 +0300
commit37889011070ff2ec52159690f652238d2b325185 (patch)
treefcdbb010b251ccad383940f8215cbd7b8ab29d02 /extern
parent34c8ba6d3e79e85231b0e63d25e7c43cf5ab4ea9 (diff)
Cleanup: fix compiler warnings
Diffstat (limited to 'extern')
-rw-r--r--extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h4
-rw-r--r--extern/quadriflow/patches/blender.patch15
2 files changed, 17 insertions, 2 deletions
diff --git a/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h b/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h
index 8de74ede8a9..f9861f39169 100644
--- a/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h
+++ b/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h
@@ -249,8 +249,8 @@ namespace lemon {
current = state + length;
- register Word *curr = state + length - 1;
- register long num;
+ Word *curr = state + length - 1;
+ long num;
num = length - shift;
while (num--) {
diff --git a/extern/quadriflow/patches/blender.patch b/extern/quadriflow/patches/blender.patch
index 55fdd123e3b..eceda489393 100644
--- a/extern/quadriflow/patches/blender.patch
+++ b/extern/quadriflow/patches/blender.patch
@@ -116,3 +116,18 @@ index c333256..8cc41da 100644
for (uint32_t i = 0; i != mV[l + 1].cols(); ++i) {
Vector2i upper = toUpper.col(i);
+diff --git a/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h b/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h
+index 8de74ede8a9..f9861f39169 100644
+--- a/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h
++++ b/extern/quadriflow/3rd/lemon-1.3.1/lemon/random.h
+@@ -249,8 +249,8 @@ namespace lemon {
+
+ current = state + length;
+
+- register Word *curr = state + length - 1;
+- register long num;
++ Word *curr = state + length - 1;
++ long num;
+
+ num = length - shift;
+ while (num--) {