commit 7c79605d66ec861c966df880e743801adb0f4945
author Ben Tyner <ben.tyner@ibm.com> Mon Feb 03 19:00:37 2020 -0600
committer Ben Tyner <ben.tyner@ibm.com> Wed Feb 12 10:09:34 2020 -0600
tree 14865b6669b78db12c202dfe6333236dcd34c0e2
parent 32c7600e4f4ab805d9bd2dfadc8a69abf474220a

Setup dependencies for subproject building

We need to define dependency information so that other projects
can build libhei as a subproject.

Signed-off-by: Ben Tyner <ben.tyner@ibm.com>
Change-Id: I9b49b7a72a87132d209c9df2a63344b7bade6f1b

src/isolator/hei_isolator.cpp

diff --git a/src/isolator/hei_isolator.cpp b/src/isolator/hei_isolator.cpp
index cb254aa..d932659 100644
--- a/src/isolator/hei_isolator.cpp
+++ b/src/isolator/hei_isolator.cpp
@@ -19,8 +19,8 @@
     ReturnCode rc;
 
     // BEGIN temporary code
-    HEI_INF("Isolator::initialize(%p,%lu,%d)", i_buffer, i_bufferSize,
-            i_forceInit);
+    HEI_INF("Isolator::initialize(%p,%" PRIu64 ",%d)", i_buffer,
+            (uint64_t)i_bufferSize, i_forceInit);
 
     auto& scom_fw    = Flyweight<ScomRegister>::getSingleton();
     auto& idScom_fw  = Flyweight<IdScomRegister>::getSingleton();

src/util/hei_bit_string.cpp

diff --git a/src/util/hei_bit_string.cpp b/src/util/hei_bit_string.cpp
index 16713ec..8fc0776 100644
--- a/src/util/hei_bit_string.cpp
+++ b/src/util/hei_bit_string.cpp
@@ -15,9 +15,9 @@
 //##############################################################################
 
 // number of bits in a uint64_t
-constexpr uint64_t BitString::UINT64_BIT_LEN = sizeof(uint64_t) * 8;
+const uint64_t BitString::UINT64_BIT_LEN = sizeof(uint64_t) * 8;
 // number of bits in a uint8_t
-constexpr uint64_t BitString::UINT8_BIT_LEN = sizeof(uint8_t) * 8;
+const uint64_t BitString::UINT8_BIT_LEN = sizeof(uint8_t) * 8;
 
 //------------------------------------------------------------------------------