All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-oe][PATCH] minifi-cpp: Fix build error found by clang
@ 2021-05-27 16:27 Khem Raj
  0 siblings, 0 replies; only message in thread
From: Khem Raj @ 2021-05-27 16:27 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Khem Raj

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...ession-language-Fix-build-with-clang.patch | 42 +++++++++++++++++++
 .../minifi-cpp/minifi-cpp_0.7.0.bb            |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta-oe/recipes-extended/minifi-cpp/files/0001-extensions-expression-language-Fix-build-with-clang.patch

diff --git a/meta-oe/recipes-extended/minifi-cpp/files/0001-extensions-expression-language-Fix-build-with-clang.patch b/meta-oe/recipes-extended/minifi-cpp/files/0001-extensions-expression-language-Fix-build-with-clang.patch
new file mode 100644
index 0000000000..2e917f0308
--- /dev/null
+++ b/meta-oe/recipes-extended/minifi-cpp/files/0001-extensions-expression-language-Fix-build-with-clang.patch
@@ -0,0 +1,42 @@
+From fb6b36d8315032ca78ab6f55ef59d35131083989 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 27 May 2021 09:01:17 -0700
+Subject: [PATCH] extensions/expression-language: Fix build with clang
+
+Define long long version of explic Value conversion function
+
+Fixes
+
+Expression.cpp:632:10: error: ambiguous conversion for
+ functional-style cast from 'std::chrono::duration<long long, std::ratio<1, 1000
+>>::rep' (aka 'long long') to 'org::apache::nifi::minifi::expression::Value'
+  return Value(std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono
+::system_clock::now().time_since_epoch()).count());
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ extensions/expression-language/common/Value.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/extensions/expression-language/common/Value.h b/extensions/expression-language/common/Value.h
+index 1666637d..e7c2c7a1 100644
+--- a/extensions/expression-language/common/Value.h
++++ b/extensions/expression-language/common/Value.h
+@@ -71,6 +71,12 @@ class Value {
+     setSignedLong(val);
+   }
+ 
++  /**
++   * Construct a signed long long value
++   */
++  explicit Value(long long val) {
++    setSignedLong(val);
++  }
+   /**
+    * Construct a long double value
+    */
+-- 
+2.31.1
+
diff --git a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
index 322b58477d..62d935eb56 100644
--- a/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
+++ b/meta-oe/recipes-extended/minifi-cpp/minifi-cpp_0.7.0.bb
@@ -29,6 +29,7 @@ SRC_URI = "git://github.com/apache/nifi-minifi-cpp.git \
             file://0003-cmake-BundledOSSPUUID.cmake-use-ossp-uuid-local-sour.patch \
             file://0001-civetweb-CMakeLists.txt-do-not-search-gcc-ar-and-gcc.patch \
             file://0001-cxxopts-Add-limits-header.patch \
+            file://0001-extensions-expression-language-Fix-build-with-clang.patch \
             file://minifi.service \
             file://systemd-volatile.conf \
             file://sysvinit-volatile.conf \
-- 
2.31.1


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2021-05-27 16:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27 16:27 [meta-oe][PATCH] minifi-cpp: Fix build error found by clang Khem Raj

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.