commit 995be6c72a49a5e4fd0d6fd8d4b9d080a245af85
author Zane Shelley <zshelle@us.ibm.com> Wed Feb 24 15:48:55 2021 -0600
committer Zane Shelley <zshelle@us.ibm.com> Sat Mar 06 23:32:50 2021 +0000
tree 50f0dac0009accc0f2f6d8ca313a6c6e2fe82e84
parent 6223ab56b43401eb0fe9201680edc3302294ba9a

Export util headers for openpower-hw-diags

Signed-off-by: Zane Shelley <zshelle@us.ibm.com>
Change-Id: I69cebf3d1637189ee4fa2c5f03725d51d89618c1

meson.build

diff --git a/meson.build b/meson.build
index 07b3dba..48834c1 100644
--- a/meson.build
+++ b/meson.build
@@ -32,7 +32,6 @@
                                 install: true)
 
 install_headers(
-    'src/hei_bit_string.hpp',
     'src/hei_chip.hpp',
     'src/hei_isolation_data.hpp',
     'src/hei_main.hpp',
@@ -42,6 +41,12 @@
     subdir : 'libhei'
 )
 
+install_headers(
+    'src/util/hei_bit_string.hpp',
+    'src/util/hei_flyweight.hpp',
+    subdir : 'libhei/util'
+)
+
 pkg_mod = import('pkgconfig')
 
 pkg_mod.generate(libraries : libhei_static,

src/hei_isolation_data.hpp

diff --git a/src/hei_isolation_data.hpp b/src/hei_isolation_data.hpp
index 65cf37b..f3a10ee 100644
--- a/src/hei_isolation_data.hpp
+++ b/src/hei_isolation_data.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <hei_bit_string.hpp>
 #include <hei_signature.hpp>
+#include <util/hei_bit_string.hpp>
 
 #include <map>
 #include <memory>

src/isolator/hei_isolation_node.cpp

diff --git a/src/isolator/hei_isolation_node.cpp b/src/isolator/hei_isolation_node.cpp
index 51e3ee0..6791d6f 100644
--- a/src/isolator/hei_isolation_node.cpp
+++ b/src/isolator/hei_isolation_node.cpp
@@ -1,5 +1,5 @@
-#include <hei_bit_string.hpp>
 #include <isolator/hei_isolation_node.hpp>
+#include <util/hei_bit_string.hpp>
 
 namespace libhei
 {

src/register/hei_hardware_register.cpp

diff --git a/src/register/hei_hardware_register.cpp b/src/register/hei_hardware_register.cpp
index 56a1afd..78e92a9 100644
--- a/src/register/hei_hardware_register.cpp
+++ b/src/register/hei_hardware_register.cpp
@@ -1,6 +1,6 @@
-#include <hei_bit_string.hpp>
 #include <hei_user_interface.hpp>
 #include <register/hei_hardware_register.hpp>
+#include <util/hei_bit_string.hpp>
 #include <util/hei_includes.hpp>
 
 namespace libhei

src/register/hei_hardware_register.hpp

diff --git a/src/register/hei_hardware_register.hpp b/src/register/hei_hardware_register.hpp
index fb39d1e..5147edf 100644
--- a/src/register/hei_hardware_register.hpp
+++ b/src/register/hei_hardware_register.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <hei_bit_string.hpp>
 #include <register/hei_register.hpp>
+#include <util/hei_bit_string.hpp>
 #include <util/hei_includes.hpp>
 
 namespace libhei

src/register/hei_register.hpp

diff --git a/src/register/hei_register.hpp b/src/register/hei_register.hpp
index 23692e5..1f69cb2 100644
--- a/src/register/hei_register.hpp
+++ b/src/register/hei_register.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <hei_bit_string.hpp>
+#include <util/hei_bit_string.hpp>
 #include <util/hei_includes.hpp>
 
 namespace libhei

src/util/hei_bit_string.cpp

diff --git a/src/util/hei_bit_string.cpp b/src/util/hei_bit_string.cpp
index 53a4d4c..bf1dfdd 100644
--- a/src/util/hei_bit_string.cpp
+++ b/src/util/hei_bit_string.cpp
@@ -2,7 +2,7 @@
  *  @brief BitString and BitStringBuffer class definitions
  */
 
-#include <hei_bit_string.hpp>
+#include <util/hei_bit_string.hpp>
 #include <util/hei_includes.hpp>
 
 #include <algorithm>

src/util/hei_bit_string.hpp

diff --git a/src/hei_bit_string.hpp b/src/util/hei_bit_string.hpp
similarity index 100%
rename from src/hei_bit_string.hpp
rename to src/util/hei_bit_string.hpp

test/bit_string_test.cpp

diff --git a/test/bit_string_test.cpp b/test/bit_string_test.cpp
index d329beb..923d503 100644
--- a/test/bit_string_test.cpp
+++ b/test/bit_string_test.cpp
@@ -1,4 +1,4 @@
-#include <hei_bit_string.hpp>
+#include <util/hei_bit_string.hpp>
 
 #include "gtest/gtest.h"