c_str -> data

2 files changed, 10 insertions, 10 deletions

diff --git a/staging_vespalib/src/tests/objects/identifiable_test.cpp b/staging_vespalib/src/tests/objects/identifiable_test.cpp
index b952ad18333..2b4d50cc786 100644
--- a/staging_vespalib/src/tests/objects/identifiable_test.cpp
+++ b/staging_vespalib/src/tests/objects/identifiable_test.cpp
@@ -161,40 +161,40 @@ void IdentifiableTest::testNboStream()
         EXPECT_EQUAL(nbostream::ok, s.state());
         EXPECT_EQUAL(10u, s.size());
         EXPECT_EQUAL(16u, s.capacity());
-        EXPECT_EQUAL(0, strncmp(s.c_str()+4, "abcdef", 6));
+        EXPECT_EQUAL(0, strncmp(s.data() + 4, "abcdef", 6));
     }
     {
         nbostream s(8);
         EXPECT_EQUAL(0u, s.size());
         EXPECT_EQUAL(8u, s.capacity());
-        const char * prev = s.c_str();
+        const char * prev = s.data();
         s << "ABCD";
         EXPECT_EQUAL(8u, s.size());
         EXPECT_EQUAL(8u, s.capacity());
-        EXPECT_EQUAL(prev, s.c_str());
+        EXPECT_EQUAL(prev, s.data());
         s << "A long string that will cause resizing";
         EXPECT_EQUAL(50u, s.size());
         EXPECT_EQUAL(64u, s.capacity());
-        EXPECT_NOT_EQUAL(prev, s.c_str());
+        EXPECT_NOT_EQUAL(prev, s.data());
     }
     {
         nbostream s(8);
         EXPECT_EQUAL(0u, s.size());
         EXPECT_EQUAL(8u, s.capacity());
-        const char * prev = s.c_str();
+        const char * prev = s.data();
         s << "ABCD";
         EXPECT_EQUAL(8u, s.size());
         EXPECT_EQUAL(8u, s.capacity());
-        EXPECT_EQUAL(prev, s.c_str());
+        EXPECT_EQUAL(prev, s.data());
         s.reserve(50);
-        EXPECT_NOT_EQUAL(prev, s.c_str());
+        EXPECT_NOT_EQUAL(prev, s.data());
         EXPECT_EQUAL(8u, s.size());
         EXPECT_EQUAL(64u, s.capacity());
-        prev = s.c_str();
+        prev = s.data();
         s << "A long string that will cause resizing";
         EXPECT_EQUAL(50u, s.size());
         EXPECT_EQUAL(64u, s.capacity());
-        EXPECT_EQUAL(prev, s.c_str());
+        EXPECT_EQUAL(prev, s.data());
     }
     {
         nbostream s;
diff --git a/staging_vespalib/src/vespa/vespalib/objects/identifiable.cpp b/staging_vespalib/src/vespa/vespalib/objects/identifiable.cpp
index 6cc2af1fc90..2465d5f9d9b 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/identifiable.cpp
+++ b/staging_vespalib/src/vespa/vespalib/objects/identifiable.cpp
@@ -244,7 +244,7 @@ int Identifiable::onCmp(const Identifiable& b) const
     nbs << b;
     size_t minLength(std::min(as.size(), bs.size()));
     if (minLength > 0) {
-        diff = memcmp(as.c_str(), bs.c_str(), minLength);
+        diff = memcmp(as.data(), bs.data(), minLength);
     }
     if (diff == 0) {
         diff = as.size() - bs.size();