diff options
| author | Caleb Palmer <cnpalmer@us.ibm.com> | 2017-02-28 10:41:44 -0600 |
|---|---|---|
| committer | Zane C. Shelley <zshelle@us.ibm.com> | 2017-03-01 13:17:50 -0500 |
| commit | 98d40a971e051f00688086a2b1b990ab4dab31af (patch) | |
| tree | 213fd951e309be15056581c955386dec8238cc4c /src/usr/diag/prdf/common/plugins/prdfMemLogParse.H | |
| parent | 1479068a50dcbf64aff61074287130afd3d3be70 (diff) | |
| download | talos-hostboot-98d40a971e051f00688086a2b1b990ab4dab31af.tar.gz talos-hostboot-98d40a971e051f00688086a2b1b990ab4dab31af.zip | |
PRD: Fix for BitString errl parser bug
A bug in BitString was causing multiple declaration errors in the
error log parser. We needed to use separate namespaces for either
FSP or Hostboot. Also updated instances in the past where we
used separate namespaces in plugins for the errl parser so we'd
be consistent.
Change-Id: Ie75f3d80685005acd4e894c7eb7f6cf1ae8738f6
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37216
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37265
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Diffstat (limited to 'src/usr/diag/prdf/common/plugins/prdfMemLogParse.H')
| -rwxr-xr-x | src/usr/diag/prdf/common/plugins/prdfMemLogParse.H | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H index 938731171..42ba72e73 100755 --- a/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H +++ b/src/usr/diag/prdf/common/plugins/prdfMemLogParse.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2013,2016 */ +/* Contributors Listed Below - COPYRIGHT 2013,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -37,12 +37,13 @@ class ErrlUsrParser; namespace PRDF { -#ifdef PRDF_HOSTBOOT_ERRL_PLUGIN +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) namespace HOSTBOOT -#else +{ +#elif defined(PRDF_FSP_ERRL_PLUGIN) namespace FSP -#endif { +#endif /** * @brief Parses MemoryMru data. @@ -132,7 +133,9 @@ bool parseBadDqBitmap( uint8_t * i_buffer, uint32_t i_buflen, bool parseTdCtlrStateData( uint8_t * i_buffer, uint32_t i_buflen, ErrlUsrParser & i_parser, uint32_t i_sigId ); -} // namespace FSP/HOSTBBOT +#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN) +} // end namespace FSP/HOSTBOOT +#endif } // end namespace PRDF #endif // __prdfMemLogParse_H |
