FFDC collection for buffers, exectue() takes a sev parameter

Change-Id: Iffb9539211b57cf371432ae6a4468577b5a91aad
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16818
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Tested-by: Brian Silver <bsilver@us.ibm.com>

2 files changed, 3 insertions, 11 deletions

diff --git a/src/import/hwpf/fapi2/include/error_info.H b/src/import/hwpf/fapi2/include/error_info.H
index 30f829987..3f53503de 100644
--- a/src/import/hwpf/fapi2/include/error_info.H
+++ b/src/import/hwpf/fapi2/include/error_info.H
@@ -71,9 +71,7 @@ namespace fapi2
     ///        special type that cannot simply be memcopied
     enum ErrorInfoFfdcSize
     {
-        EI_FFDC_SIZE_BUF    = 0xffff,   // fapi2::buffer<T>
         EI_FFDC_SIZE_TARGET = 0xfffe,   // fapi2::Target
-        EI_FFDC_SIZE_VBUF   = 0xfffd,   // fapi2::variable_buffer
         EI_FFDC_MAX_SIZE    = 0x1000,   // Limit regular FFDC capture to 4kb
     };
 
@@ -82,6 +80,7 @@ namespace fapi2
     ///
     enum errlSeverity_t
     {
+        FAPI2_ERRL_SEV_UNDEFINED     = 0x00, /// Used internally by ffdc mechanism
         FAPI2_ERRL_SEV_RECOVERED     = 0x10, /// Not seen by customer
         FAPI2_ERRL_SEV_PREDICTIVE    = 0x20, /// Error recovered but customer will see
         FAPI2_ERRL_SEV_UNRECOVERABLE = 0x40  /// Unrecoverable, general
diff --git a/src/import/hwpf/fapi2/include/return_code.H b/src/import/hwpf/fapi2/include/return_code.H
index 1e48854db..e4f8edac5 100644
--- a/src/import/hwpf/fapi2/include/return_code.H
+++ b/src/import/hwpf/fapi2/include/return_code.H
@@ -144,17 +144,10 @@ namespace fapi2
         ///
         /// @brief Assignement operator
         ///
+#ifdef DOXYGEN
         inline ReturnCode& operator=(const uint64_t& rhs)
-            {
-                iv_rc = rhs;
-                return *this;
-            }
-
         inline ReturnCode& operator=(const ReturnCodes& rhs)
-            {
-                iv_rc = rhs;
-                return *this;
-            }
+#endif
 
         inline bool operator==(const uint64_t& rhs) const
             { return rhs == iv_rc; }