BaseTools: correct mal-typed CVfrDLGLexer::errstd

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / VfrError.h

diff --git a/BaseTools/Source/C/VfrCompile/VfrError.h b/BaseTools/Source/C/VfrCompile/VfrError.h
index c0b4ec64a2ce48333e91c8da6e190b3527948a26..8bae04953191e616137dc0137c59667f00449f6c 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrError.h
+++ b/BaseTools/Source/C/VfrCompile/VfrError.h
@@ -2,7 +2,7 @@
   \r
   VfrCompiler Error definition\r
 \r
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -44,6 +44,7 @@ typedef enum {
   VFR_RETURN_DEFAULT_VALUE_REDEFINED,\r
   VFR_RETURN_CONSTANT_ONLY,\r
   VFR_RETURN_VARSTORE_NAME_REDEFINED_ERROR,\r
+  VFR_RETURN_BIT_WIDTH_ERROR,\r
   VFR_RETURN_CODEUNDEFINED\r
 } EFI_VFR_RETURN_CODE;\r
 \r
@@ -51,6 +52,7 @@ typedef enum {
   VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0,\r
   VFR_WARNING_STRING_TO_UINT_OVERFLOW,\r
   VFR_WARNING_ACTION_WITH_TEXT_TWO,\r
+  VFR_WARNING_OBSOLETED_FRAMEWORK_OPCODE,\r
   VFR_WARNING_CODEUNDEFINED\r
 } EFI_VFR_WARNING_CODE;\r
 \r
@@ -72,6 +74,10 @@ struct SVfrFileScopeRecord {
 \r
   SVfrFileScopeRecord (IN CHAR8 *, IN UINT32);\r
   ~SVfrFileScopeRecord();\r
+\r
+private:\r
+  SVfrFileScopeRecord (IN CONST SVfrFileScopeRecord&);             // Prevent copy-construction\r
+  SVfrFileScopeRecord& operator= (IN CONST SVfrFileScopeRecord&);  // Prevent assignment\r
 };\r
 \r
 class CVfrErrorHandle {\r
@@ -94,6 +100,10 @@ public:
   UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);\r
   UINT8 HandleWarning (IN EFI_VFR_WARNING_CODE, IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL);\r
   VOID  PrintMsg (IN UINT32 LineNum = 0, IN CHAR8 *TokName = NULL, IN CONST CHAR8 *MsgType = "Error", IN CONST CHAR8 *ErrorMsg = "");\r
+\r
+private:\r
+  CVfrErrorHandle (IN CONST CVfrErrorHandle&);             // Prevent copy-construction\r
+  CVfrErrorHandle& operator= (IN CONST CVfrErrorHandle&);  // Prevent assignment\r
 };\r
 \r
 #define CHECK_ERROR_RETURN(f, v) do { EFI_VFR_RETURN_CODE r; if ((r = (f)) != (v)) { return r; } } while (0)\r