summaryrefslogtreecommitdiffstats
path: root/document
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-01-17 09:59:48 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-01-17 09:59:48 +0000
commitc9b92a456b0dd9980dfa17806b4f0948be60002f (patch)
treeec36e6a6a0dd59c4db2c4717f936bcf40a130d33 /document
parent21aa89bea7799ef8da18c1804c3d6fddfc085449 (diff)
GC unused code
Diffstat (limited to 'document')
-rw-r--r--document/src/vespa/document/fieldvalue/serializablearray.cpp5
-rw-r--r--document/src/vespa/document/serialization/util.h27
2 files changed, 3 insertions, 29 deletions
diff --git a/document/src/vespa/document/fieldvalue/serializablearray.cpp b/document/src/vespa/document/fieldvalue/serializablearray.cpp
index 996ed378f2e..3917a8a63a4 100644
--- a/document/src/vespa/document/fieldvalue/serializablearray.cpp
+++ b/document/src/vespa/document/fieldvalue/serializablearray.cpp
@@ -49,7 +49,8 @@ SerializableArray::SerializableArray(EntryMap entries, ByteBuffer::UP buffer,
}
}
-serializablearray::BufferMap & ensure(std::unique_ptr<serializablearray::BufferMap> & owned) {
+serializablearray::BufferMap &
+ensure(std::unique_ptr<serializablearray::BufferMap> & owned) {
if (!owned) {
owned = std::make_unique<serializablearray::BufferMap>();
}
@@ -195,7 +196,7 @@ SerializableArray::deCompress() // throw (DeserializeException)
_uncompSerData = std::move(_compSerData);
LOG_ASSERT(_uncompressedLength == _uncompSerData->getRemaining());
} else {
- ByteBuffer::UP newSerialization(new ByteBuffer(_uncompressedLength));
+ auto newSerialization = std::make_unique<ByteBuffer>(_uncompressedLength);
vespalib::DataBuffer unCompressed(newSerialization->getBuffer(), newSerialization->getLength());
unCompressed.clear();
try {
diff --git a/document/src/vespa/document/serialization/util.h b/document/src/vespa/document/serialization/util.h
index cbcc2c97017..05953f1de2b 100644
--- a/document/src/vespa/document/serialization/util.h
+++ b/document/src/vespa/document/serialization/util.h
@@ -97,32 +97,5 @@ void putInt2_4_8Bytes(Output &out, uint64_t val) {
}
}
-inline uint32_t sizeOfInt1_4Bytes(uint32_t val) {
- if (val < 0x80) {
- return 1;
- } else {
- return 4;
- }
-}
-
-inline uint32_t sizeOfInt1_2_4Bytes(uint32_t val) {
- if (val < 0x80) {
- return 1;
- } else if (val < 0x4000) {
- return 2;
- } else {
- return 4;
- }
-}
-
-inline uint32_t sizeOfInt2_4_8Bytes(uint64_t val) {
- if (val < 0x8000) {
- return 2;
- } else if (val < 0x40000000) {
- return 4;
- } else {
- return 8;
- }
-}
} // namespace document