PRD: C++11 bad string literal concatenation

Change-Id: Ib41a5b356a35cac87c20139d3ca6c5ef0e0de8bb
RTC:124186
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/18276
Tested-by: Jenkins Server
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Tested-by: Jenkins OP Build CI
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 13 insertions, 11 deletions

diff --git a/src/usr/diag/prdf/framework/config/prdfMbaDomain.C b/src/usr/diag/prdf/framework/config/prdfMbaDomain.C
index fff0bc20e..a53c83522 100644
--- a/src/usr/diag/prdf/framework/config/prdfMbaDomain.C
+++ b/src/usr/diag/prdf/framework/config/prdfMbaDomain.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2013,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
+/* [+] 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.       */
@@ -56,7 +58,7 @@ int32_t MbaDomain::startScrub()
             int32_t l_rc = mbadb->iv_tdCtlr.startInitialBgScrub();
             if ( SUCCESS != l_rc )
             {
-                PRDF_ERR( PRDF_FUNC"startInitialBgScrub() failed: MBA=0x%08x",
+                PRDF_ERR( PRDF_FUNC "startInitialBgScrub() failed: MBA=0x%08x",
                           mbaChip->GetId() );
                 o_rc = FAIL; continue; // Keep going.
             }
diff --git a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C b/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C
index e5357d8db..0189c3567 100755
--- a/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C
+++ b/src/usr/diag/prdf/framework/register/prdfFileRegisterAccess.C
@@ -61,7 +61,7 @@ errlHndl_t FileScomAccessor::Access(
             bs.SetFieldJustify(32, 32, data      );
             break;
         default:
-            PRDF_ERR(PRDF_FUNC"Wrong Operation:%u", operation);
+            PRDF_ERR(PRDF_FUNC "Wrong Operation:%u", operation);
     }
 
     return errlH;
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices.C b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
index 7236f8f90..724b1a11c 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices.C
@@ -126,7 +126,7 @@ TARGETING::TargetHandle_t getMasterCore( TARGETING::TargetHandle_t i_procTgt )
 {
     #define PRDF_FUNC "[PlatServices::getMasterCore] "
 
-    PRDF_ERR( PRDF_FUNC"MasterCore info not available in hostboot: PROC = "
+    PRDF_ERR( PRDF_FUNC "MasterCore info not available in hostboot: PROC = "
               "0x%08x ",getHuid( i_procTgt ) );
     return NULL;
 
@@ -158,7 +158,7 @@ int32_t getCfam( ExtensibleChip * i_chip,
 
             if( l_pMasterProcChip == l_procTgt )
             {
-                PRDF_DTRAC( PRDF_FUNC"can't access CFAM from master "
+                PRDF_DTRAC( PRDF_FUNC "can't access CFAM from master "
                             "proc: 0x%.8X", i_chip->GetId() );
                 break;
             }
@@ -180,7 +180,7 @@ int32_t getCfam( ExtensibleChip * i_chip,
         else
         {
             rc = FAIL;
-            PRDF_ERR( PRDF_FUNC"chip: 0x%.8X, failed to get cfam address: "
+            PRDF_ERR( PRDF_FUNC "chip: 0x%.8X, failed to get cfam address: "
                       "0x%X", i_chip->GetId(), i_addr );
             PRDF_COMMIT_ERRL(errH, ERRL_ACTION_SA|ERRL_ACTION_REPORT);
             break;
diff --git a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
index 6eb63d5e0..d53d3711c 100644
--- a/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
+++ b/src/usr/diag/prdf/framework/service/prdfPlatServices_ipl.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -83,7 +83,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget,
         TYPE l_type = getTargetType(i_mbaTarget);
         if ( TYPE_MBA != l_type )
         {
-            PRDF_ERR( PRDF_FUNC"unsupported target type %d", l_type );
+            PRDF_ERR( PRDF_FUNC "unsupported target type %d", l_type );
             o_rc = FAIL;
             break;
         }
@@ -97,7 +97,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget,
         errlHndl_t errl = MDIA::processEvent( l_mdiaEvent );
         if ( NULL != errl )
         {
-            PRDF_ERR( PRDF_FUNC"MDIA::processEvent() failed" );
+            PRDF_ERR( PRDF_FUNC "MDIA::processEvent() failed" );
             PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
             o_rc = FAIL;
             break;
@@ -107,7 +107,7 @@ int32_t mdiaSendEventMsg( TargetHandle_t i_mbaTarget,
 
     if ( SUCCESS != o_rc )
     {
-        PRDF_ERR( PRDF_FUNC"Failed: i_target=0x%08x i_eventType=%d",
+        PRDF_ERR( PRDF_FUNC "Failed: i_target=0x%08x i_eventType=%d",
                   getHuid(i_mbaTarget), i_eventType );
     }
 
@@ -160,7 +160,7 @@ int32_t mssIplUeIsolation( TargetHandle_t i_mba, const CenRank & i_rank,
                       i_rank.getMaster(), data );
     if ( NULL != errl )
     {
-        PRDF_ERR( PRDF_FUNC"mss_IPL_UE_isolation() failed: MBA=0x%08x "
+        PRDF_ERR( PRDF_FUNC "mss_IPL_UE_isolation() failed: MBA=0x%08x "
                   "rank=%d", getHuid(i_mba), i_rank.getMaster() );
         PRDF_COMMIT_ERRL( errl, ERRL_ACTION_REPORT );
         o_rc = FAIL;