diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2016-05-09 12:42:45 -0500 |
|---|---|---|
| committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-05-20 04:43:03 -0400 |
| commit | 8e8516fb49c06335e6494ea78445a95848997d4b (patch) | |
| tree | a06cec5a219119f5de2afdec027b9375730a31e6 /import/hwpf | |
| parent | a8c94625e29f1eb1a12565a2a80cab3bf580b289 (diff) | |
| download | talos-sbe-8e8516fb49c06335e6494ea78445a95848997d4b.tar.gz talos-sbe-8e8516fb49c06335e6494ea78445a95848997d4b.zip | |
Fix assert() in variable_buffer
-Updated code to use fapi2::Assert instead of assert()
Change-Id: I5184f1f41c7b0568fac8d98e6b38d4de1b76269f
RTC:128525
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24261
Tested-by: Jenkins Server
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Brian R. Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/24263
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'import/hwpf')
| -rw-r--r-- | import/hwpf/fapi2/include/variable_buffer.H | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/import/hwpf/fapi2/include/variable_buffer.H b/import/hwpf/fapi2/include/variable_buffer.H index 67de22c5..5680370b 100644 --- a/import/hwpf/fapi2/include/variable_buffer.H +++ b/import/hwpf/fapi2/include/variable_buffer.H @@ -27,10 +27,14 @@ #include <buffer_parameters.H> #include <buffer_traits.H> #include <return_code_defs.H> -#include <cassert> namespace fapi2 { + +// forward fapi2::Assert() +extern void Assert(bool); + + /// @brief Get a 32 bit mask quickly // This is one of the main reasons we static_assert in the ctor's // to ensure the unit_type is 32 bits. @@ -377,7 +381,7 @@ class variable_buffer ReturnCodes rc; // make sure we stay within our container - assert((L > 0) && ((SB + L) <= this->iv_perceived_bit_length) ); + fapi2::Assert((L > 0) && ((SB + L) <= this->iv_perceived_bit_length) ); uint32_t mask = 0; @@ -494,7 +498,7 @@ class variable_buffer inline bool isBitSet( bits_type SB, bits_type L = 1 ) const { // make sure we stay within our container - assert( ((L > 0) && ((SB + L) <= this->iv_perceived_bit_length)) ); + fapi2::Assert( ((L > 0) && ((SB + L) <= this->iv_perceived_bit_length)) ); bool is_set = false; uint32_t mask = 0; |
