From 33d9904abc19905861ec8a0ccf9b435eb955faed Mon Sep 17 00:00:00 2001 From: Alan Somers Date: Thu, 26 Oct 2017 17:56:34 +0000 Subject: [PATCH] Partially revert r325011: restore Guid's default constructor Reported by: ohartmann MFC after: 3 weeks X-MFC-With: 325011 Sponsored by: Spectra Logic Corp --- lib/libdevdctl/guid.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/libdevdctl/guid.h b/lib/libdevdctl/guid.h index e40d3f983aab..02ea6f27dc04 100644 --- a/lib/libdevdctl/guid.h +++ b/lib/libdevdctl/guid.h @@ -62,7 +62,11 @@ class Guid { public: /* Constructors */ + /* Default constructor: an Invalid guid */ + Guid(); + /* Construct a guid from a provided integer */ Guid(uint64_t guid); + /* Construct a guid from a string in base 8, 10, or 16 */ Guid(const std::string &guid); static Guid InvalidGuid(); @@ -88,6 +92,12 @@ class Guid }; //- Guid Inline Public Methods ------------------------------------------------ +inline +Guid::Guid() + : m_GUID(INVALID_GUID) +{ +} + inline Guid::Guid(uint64_t guid) : m_GUID(guid)