Design Change for PRD Resolution

Change-Id: I4d3ed18d78a8f829029354d85550b5b5f311a155
RTC: 47516
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2765
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3198

1 files changed, 5 insertions, 8 deletions

diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h
index 11f86cba0..15df041a7 100755
--- a/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h
+++ b/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h
@@ -49,10 +49,7 @@
 //--------------------------------------------------------------------
 
 #include <prdfCallouts.H>
-
-#if !defined(iipResolution_h)
 #include <iipResolution.h>
-#endif
 
 namespace PRDF
 {
@@ -81,7 +78,7 @@ public:
    <br><b>Exceptions:  </b> None.
    </ul><br>
    */
-  CalloutResolution(PRDF::PRDcallout callout, PRDF::PRDpriority priority);
+  CalloutResolution(PRDcallout callout, PRDpriority priority);
   CalloutResolution(void);    // default
   CalloutResolution(const CalloutResolution & cr);
 
@@ -131,15 +128,15 @@ public:
 private:  // functions
 private:  // Data
 
-  PRDF::PRDcallout xMruCallout;
-  PRDF::PRDpriority xPriority;
+ PRDcallout xMruCallout;
+ PRDpriority xPriority;
 
 };
 
 
 inline
-CalloutResolution::CalloutResolution(PRDF::PRDcallout callout,
-                                     PRDF::PRDpriority priority)
+CalloutResolution::CalloutResolution(PRDcallout callout,
+                                     PRDpriority priority)
 : xMruCallout(callout), xPriority(priority)
 {}