diff options
Diffstat (limited to 'pmt/src/lib')
-rw-r--r-- | pmt/src/lib/pmt.cc | 6 | ||||
-rw-r--r-- | pmt/src/lib/pmt.h | 28 | ||||
-rw-r--r-- | pmt/src/lib/pmt_int.h | 2 | ||||
-rw-r--r-- | pmt/src/lib/unv_qa_template.cc.t | 2 | ||||
-rw-r--r-- | pmt/src/lib/unv_template.cc.t | 10 | ||||
-rw-r--r-- | pmt/src/lib/unv_template.h.t | 4 |
6 files changed, 26 insertions, 26 deletions
diff --git a/pmt/src/lib/pmt.cc b/pmt/src/lib/pmt.cc index 537b7a05a..f233a1398 100644 --- a/pmt/src/lib/pmt.cc +++ b/pmt/src/lib/pmt.cc @@ -508,11 +508,11 @@ pmt_uniform_vector_elements(pmt_t vector, size_t &len) } void * -pmt_uniform_vector_writeable_elements(pmt_t vector, size_t &len) +pmt_uniform_vector_writable_elements(pmt_t vector, size_t &len) { if (!vector->is_uniform_vector()) - throw pmt_wrong_type("pmt_uniform_vector_writeable_elements", vector); - return _uniform_vector(vector)->uniform_writeable_elements(len); + throw pmt_wrong_type("pmt_uniform_vector_writable_elements", vector); + return _uniform_vector(vector)->uniform_writable_elements(len); } //////////////////////////////////////////////////////////////////////////// diff --git a/pmt/src/lib/pmt.h b/pmt/src/lib/pmt.h index 970dd6c7d..57945f70e 100644 --- a/pmt/src/lib/pmt.h +++ b/pmt/src/lib/pmt.h @@ -375,20 +375,20 @@ const std::complex<double> *pmt_c64vector_elements(pmt_t v, size_t &len); //< le // Return non-const pointers to the elements -void *pmt_uniform_vector_writeable_elements(pmt_t v, size_t &len); //< works with any; len is in bytes - -uint8_t *pmt_u8vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int8_t *pmt_s8vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -uint16_t *pmt_u16vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int16_t *pmt_s16vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -uint32_t *pmt_u32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int32_t *pmt_s32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -uint64_t *pmt_u64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -int64_t *pmt_s64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -float *pmt_f32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -double *pmt_f64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -std::complex<float> *pmt_c32vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements -std::complex<double> *pmt_c64vector_writeable_elements(pmt_t v, size_t &len); //< len is in elements +void *pmt_uniform_vector_writable_elements(pmt_t v, size_t &len); //< works with any; len is in bytes + +uint8_t *pmt_u8vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int8_t *pmt_s8vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +uint16_t *pmt_u16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int16_t *pmt_s16vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +uint32_t *pmt_u32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int32_t *pmt_s32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +uint64_t *pmt_u64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +int64_t *pmt_s64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +float *pmt_f32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +double *pmt_f64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +std::complex<float> *pmt_c32vector_writable_elements(pmt_t v, size_t &len); //< len is in elements +std::complex<double> *pmt_c64vector_writable_elements(pmt_t v, size_t &len); //< len is in elements /* * ------------------------------------------------------------------------ diff --git a/pmt/src/lib/pmt_int.h b/pmt/src/lib/pmt_int.h index d2b557521..285244cb5 100644 --- a/pmt/src/lib/pmt_int.h +++ b/pmt/src/lib/pmt_int.h @@ -215,7 +215,7 @@ class pmt_uniform_vector : public pmt_base public: bool is_uniform_vector() const { return true; } virtual const void *uniform_elements(size_t &len) = 0; - virtual void *uniform_writeable_elements(size_t &len) = 0; + virtual void *uniform_writable_elements(size_t &len) = 0; virtual size_t length() const = 0; }; diff --git a/pmt/src/lib/unv_qa_template.cc.t b/pmt/src/lib/unv_qa_template.cc.t index 3db508bce..1e2c8e8eb 100644 --- a/pmt/src/lib/unv_qa_template.cc.t +++ b/pmt/src/lib/unv_qa_template.cc.t @@ -26,7 +26,7 @@ qa_pmt_unv::test_@TAG@vector() CPPUNIT_ASSERT_EQUAL(s1, rd[1]); CPPUNIT_ASSERT_EQUAL(s2, rd[2]); - @TYPE@ *wr = pmt_@TAG@vector_writeable_elements(v1, len); + @TYPE@ *wr = pmt_@TAG@vector_writable_elements(v1, len); CPPUNIT_ASSERT_EQUAL(len, N); wr[0] = @TYPE@(0); CPPUNIT_ASSERT_EQUAL(@TYPE@(0), wr[0]); diff --git a/pmt/src/lib/unv_template.cc.t b/pmt/src/lib/unv_template.cc.t index 904829da7..1e86caeac 100644 --- a/pmt/src/lib/unv_template.cc.t +++ b/pmt/src/lib/unv_template.cc.t @@ -47,7 +47,7 @@ pmt_@TAG@vector::elements(size_t &len) } @TYPE@ * -pmt_@TAG@vector::writeable_elements(size_t &len) +pmt_@TAG@vector::writable_elements(size_t &len) { len = length(); return &d_v[0]; @@ -61,7 +61,7 @@ pmt_@TAG@vector::uniform_elements(size_t &len) } void* -pmt_@TAG@vector::uniform_writeable_elements(size_t &len) +pmt_@TAG@vector::uniform_writable_elements(size_t &len) { len = length() * sizeof(@TYPE@); return &d_v[0]; @@ -110,9 +110,9 @@ pmt_@TAG@vector_elements(pmt_t vector, size_t &len) } @TYPE@ * -pmt_@TAG@vector_writeable_elements(pmt_t vector, size_t &len) +pmt_@TAG@vector_writable_elements(pmt_t vector, size_t &len) { if (!vector->is_@TAG@vector()) - throw pmt_wrong_type("pmt_@TAG@vector_writeable_elements", vector); - return _@TAG@vector(vector)->writeable_elements(len); + throw pmt_wrong_type("pmt_@TAG@vector_writable_elements", vector); + return _@TAG@vector(vector)->writable_elements(len); } diff --git a/pmt/src/lib/unv_template.h.t b/pmt/src/lib/unv_template.h.t index 6a084ec50..83ba0be0f 100644 --- a/pmt/src/lib/unv_template.h.t +++ b/pmt/src/lib/unv_template.h.t @@ -17,7 +17,7 @@ public: @TYPE@ ref(size_t k) const; void set(size_t k, @TYPE@ x); const @TYPE@ *elements(size_t &len); - @TYPE@ *writeable_elements(size_t &len); + @TYPE@ *writable_elements(size_t &len); const void *uniform_elements(size_t &len); - void *uniform_writeable_elements(size_t &len); + void *uniform_writable_elements(size_t &len); }; |