OpenSystemsDevelopment / qpdf

Commit 1264f4733e6fed2a25d08bf2eadbe4ea45150b2d

Authored by Jay Berkenbilt
Committed by GitHub
2 parents 952b00ae 12967bdf

Merge pull request #756 from jbarlow83/unique-ptr 

Use unique_ptr and move constructor for Buffer::Members
Inline Side-by-side
Showing 3 changed files with 35 additions and 2 deletions
include/qpdf/Buffer.hh
  View file @1264f47
... ... @@ -49,6 +49,10 @@ class Buffer
49 49 QPDF_DLL
50 50 Buffer& operator=(Buffer const&);
51 51 QPDF_DLL
  52 + Buffer(Buffer &&) noexcept;
  53 + QPDF_DLL
  54 + Buffer& operator=(Buffer &&) noexcept;
  55 + QPDF_DLL
52 56 size_t getSize() const;
53 57 QPDF_DLL
54 58 unsigned char const* getBuffer() const;
... ... @@ -75,7 +79,7 @@ class Buffer
75 79  
76 80 void copy(Buffer const&);
77 81  
78   - std::shared_ptr<Members> m;
  82 + std::unique_ptr<Members> m;
79 83 };
80 84  
81 85 #endif // BUFFER_HH
... ...
libqpdf/Buffer.cc
  View file @1264f47
... ... @@ -48,12 +48,24 @@ Buffer::operator=(Buffer const&amp; rhs)
48 48 return *this;
49 49 }
50 50  
  51 +Buffer::Buffer(Buffer&& rhs) noexcept :
  52 + m(std::move(rhs.m))
  53 +{
  54 +}
  55 +
  56 +Buffer&
  57 +Buffer::operator=(Buffer&& rhs) noexcept
  58 +{
  59 + std::swap(this->m, rhs.m);
  60 + return *this;
  61 +}
  62 +
51 63 void
52 64 Buffer::copy(Buffer const& rhs)
53 65 {
54 66 if (this != &rhs) {
55 67 this->m =
56   - std::shared_ptr<Members>(new Members(rhs.m->size, nullptr, true));
  68 + std::unique_ptr<Members>(new Members(rhs.m->size, nullptr, true));
57 69 if (this->m->size) {
58 70 memcpy(this->m->buf, rhs.m->buf, this->m->size);
59 71 }
... ...
libtests/buffer.cc
  View file @1264f47
... ... @@ -37,6 +37,23 @@ main()
37 37 assert(bc2p[1] == 'W');
38 38 }
39 39  
  40 + {
  41 + // Test that buffers can be moved.
  42 + Buffer bm1(2);
  43 + unsigned char* bm1p = bm1.getBuffer();
  44 + bm1p[0] = 'Q';
  45 + bm1p[1] = 'W';
  46 + Buffer bm2(std::move(bm1));
  47 + bm1p[0] = 'R';
  48 + unsigned char* bm2p = bm2.getBuffer();
  49 + assert(bm2p == bm1p);
  50 + assert(bm2p[0] == 'R');
  51 +
  52 + Buffer bm3 = std::move(bm2);
  53 + unsigned char* bm3p = bm3.getBuffer();
  54 + assert(bm3p == bm2p);
  55 + }
  56 +
40 57 try {
41 58 Pl_Discard discard;
42 59 Pl_Count count("count", &discard);
... ...