Mesa (master): clover/util: Implement compat:: string using aggregation instead of inheritance.
Francisco Jerez
currojerez at kemper.freedesktop.org
Fri Sep 5 06:30:51 UTC 2014
Module: Mesa
Branch: master
Commit: 923c72982e9cdc9766e395f709aeae95e1d2424e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=923c72982e9cdc9766e395f709aeae95e1d2424e
Author: Francisco Jerez <currojerez at riseup.net>
Date: Mon Aug 18 15:21:52 2014 +0300
clover/util: Implement compat::string using aggregation instead of inheritance.
---
src/gallium/state_trackers/clover/util/compat.hpp | 76 +++++++++++++++++++--
1 file changed, 71 insertions(+), 5 deletions(-)
diff --git a/src/gallium/state_trackers/clover/util/compat.hpp b/src/gallium/state_trackers/clover/util/compat.hpp
index a4e3938..e0ab965 100644
--- a/src/gallium/state_trackers/clover/util/compat.hpp
+++ b/src/gallium/state_trackers/clover/util/compat.hpp
@@ -280,20 +280,83 @@ namespace clover {
size_t offset;
};
- class string : public vector<char> {
+ class string {
public:
- string() : vector() {
+ typedef char *iterator;
+ typedef const char *const_iterator;
+ typedef char value_type;
+ typedef char &reference;
+ typedef const char &const_reference;
+ typedef std::ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+
+ string() : v() {
}
- string(const char *p) : vector(p, std::strlen(p)) {
+ string(const char *p) : v(p, std::strlen(p)) {
}
template<typename C>
- string(const C &v) : vector(v) {
+ string(const C &v) : v(v) {
}
operator std::string() const {
- return std::string(begin(), end());
+ return std::string(v.begin(), v.end());
+ }
+
+ void
+ reserve(size_type n) {
+ v.reserve(n);
+ }
+
+ void
+ resize(size_type n, char x = char()) {
+ v.resize(n, x);
+ }
+
+ void
+ push_back(char x) {
+ v.push_back(x);
+ }
+
+ size_type
+ size() const {
+ return v.size();
+ }
+
+ size_type
+ capacity() const {
+ return v.capacity();
+ }
+
+ iterator
+ begin() {
+ return v.begin();
+ }
+
+ const_iterator
+ begin() const {
+ return v.begin();
+ }
+
+ iterator
+ end() {
+ return v.end();
+ }
+
+ const_iterator
+ end() const {
+ return v.end();
+ }
+
+ reference
+ operator[](size_type i) {
+ return v[i];
+ }
+
+ const_reference
+ operator[](size_type i) const {
+ return v[i];
}
const char *
@@ -310,6 +373,9 @@ namespace clover {
return end();
}
+
+ private:
+ mutable vector<char> v;
};
template<typename T>
More information about the mesa-commit
mailing list