svn commit: r325016 - head/lib/libdevdctl
Alan Somers
asomers at FreeBSD.org
Thu Oct 26 17:56:35 UTC 2017
Author: asomers
Date: Thu Oct 26 17:56:34 2017
New Revision: 325016
URL: https://svnweb.freebsd.org/changeset/base/325016
Log:
Partially revert r325011: restore Guid's default constructor
Reported by: ohartmann
MFC after: 3 weeks
X-MFC-With: 325011
Sponsored by: Spectra Logic Corp
Modified:
head/lib/libdevdctl/guid.h
Modified: head/lib/libdevdctl/guid.h
==============================================================================
--- head/lib/libdevdctl/guid.h Thu Oct 26 17:45:01 2017 (r325015)
+++ head/lib/libdevdctl/guid.h Thu Oct 26 17:56:34 2017 (r325016)
@@ -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)
More information about the svn-src-all
mailing list