summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2018-08-27 13:36:23 +0200
committerGitHub <noreply@github.com>2018-08-27 13:36:23 +0200
commit439e562b1a69b8104fc6bbf5d7d8f69f373264f3 (patch)
treed0b31d8c41eaab08c3f4de57fb8b72c281bdf426
parent49cf675ef460eb8baac7b5e598cd018f53bcec39 (diff)
parent0fe3bda9affa315268f4122319b73ce365a162b3 (diff)
Merge pull request #21474 from elasota/fix-cvtt-scalar
Fix CVTT scalar version not compiling
-rw-r--r--thirdparty/cvtt/ConvectionKernels.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/thirdparty/cvtt/ConvectionKernels.cpp b/thirdparty/cvtt/ConvectionKernels.cpp
index 5137e35730..8d379344e1 100644
--- a/thirdparty/cvtt/ConvectionKernels.cpp
+++ b/thirdparty/cvtt/ConvectionKernels.cpp
@@ -1420,6 +1420,16 @@ namespace cvtt
return v;
}
+ static bool MakeBoolInt16(bool b)
+ {
+ return b;
+ }
+
+ static bool MakeBoolFloat(bool b)
+ {
+ return b;
+ }
+
static bool AndNot(bool a, bool b)
{
return a && !b;