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>

1 files changed, 10 insertions, 5 deletions

diff --git a/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H b/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H
index 35d204d1d..50c4d519d 100755
--- a/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H
+++ b/src/usr/diag/prdf/common/plugins/prdrErrlPluginsSupt.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2005,2014              */
+/* Contributors Listed Below - COPYRIGHT 2005,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -146,12 +148,13 @@
 
 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
 
 typedef std::map<__PRDR_PLUGIN_IDTYPE, std::string> PrdrErrSigEntries;
 typedef std::map<__PRDR_PLUGIN_HOMTYPE, PrdrErrSigEntries> PrdrErrSigTable;
@@ -168,7 +171,9 @@ typedef std::map<__PRDR_PLUGIN_HOMTYPE, PrdrRegIdEntries> PrdrRegIdTable;
 PrdrRegIdTable & GetRegisterIdTable();
 PrdrErrSigTable & GetErrorSigTable();
 
-} // namespace FSP/HOSTBBOT
+#if defined(PRDF_HOSTBOOT_ERRL_PLUGIN) || defined(PRDF_FSP_ERRL_PLUGIN)
+} // end namespace FSP/HOSTBOOT
+#endif
 } // end namespace PRDF
 
 #endif