1 files changed, 10 insertions, 12 deletions
diff --git a/source/Core/DataBufferHeap.cpp b/source/Core/DataBufferHeap.cpp
index ba1314448bbd..4e5389e053e9 100644
--- a/source/Core/DataBufferHeap.cpp
+++ b/source/Core/DataBufferHeap.cpp
@@ -9,6 +9,11 @@
 
 #include "lldb/Core/DataBufferHeap.h"
 
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+
 using namespace lldb_private;
 
 //----------------------------------------------------------------------
@@ -44,32 +49,26 @@ DataBufferHeap::DataBufferHeap (const void *src, lldb::offset_t src_len) :
 // Virtual destructor since this class inherits from a pure virtual
 // base class.
 //----------------------------------------------------------------------
-DataBufferHeap::~DataBufferHeap ()
-{
-}
+DataBufferHeap::~DataBufferHeap() = default;
 
 //----------------------------------------------------------------------
-// Return a pointer to the bytes owned by this object, or NULL if
+// Return a pointer to the bytes owned by this object, or nullptr if
 // the object contains no bytes.
 //----------------------------------------------------------------------
 uint8_t *
 DataBufferHeap::GetBytes ()
 {
-    if (m_data.empty())
-        return NULL;
-    return &m_data[0];
+    return (m_data.empty() ? nullptr : m_data.data());
 }
 
 //----------------------------------------------------------------------
-// Return a const pointer to the bytes owned by this object, or NULL
+// Return a const pointer to the bytes owned by this object, or nullptr
 // if the object contains no bytes.
 //----------------------------------------------------------------------
 const uint8_t *
 DataBufferHeap::GetBytes () const
 {
-    if (m_data.empty())
-        return NULL;
-    return &m_data[0];
+    return (m_data.empty() ? nullptr : m_data.data());
 }
 
 //----------------------------------------------------------------------
@@ -81,7 +80,6 @@ DataBufferHeap::GetByteSize () const
     return m_data.size();
 }
 
-
 //----------------------------------------------------------------------
 // Sets the number of bytes that this object should be able to
 // contain. This can be used prior to copying data into the buffer.