|
7 | 7 | #include <boost/move/core.hpp> |
8 | 8 | #include "sequence_ref.h" |
9 | 9 | namespace mfast { |
10 | | -template <typename CRef> class squence_type_base { |
| 10 | +template <typename CRef> class sequence_type_base { |
11 | 11 | #ifdef BOOST_NO_RVALUE_REFERENCES |
12 | | - BOOST_MOVABLE_BUT_NOT_COPYABLE(squence_type_base) |
| 12 | + BOOST_MOVABLE_BUT_NOT_COPYABLE(sequence_type_base) |
13 | 13 | #endif |
14 | 14 | public: |
15 | 15 | typedef typename CRef::instruction_cptr instruction_cptr; |
16 | 16 | typedef CRef cref_type; |
17 | 17 | typedef typename mref_of<cref_type>::type mref_type; |
18 | 18 |
|
19 | | - squence_type_base(mfast::allocator *alloc = nullptr, |
| 19 | + sequence_type_base(mfast::allocator *alloc = nullptr, |
20 | 20 | instruction_cptr instruction = 0, |
21 | 21 | value_storage *fields_storage = nullptr); |
22 | 22 |
|
23 | 23 | // a special constructor to facilitate puting a message_type instance in an |
24 | 24 | // associative |
25 | 25 | // container |
26 | 26 | // using emplace() |
27 | | - squence_type_base(std::pair<mfast::allocator *, instruction_cptr> p); |
28 | | - ~squence_type_base(); |
| 27 | + sequence_type_base(std::pair<mfast::allocator *, instruction_cptr> p); |
| 28 | + ~sequence_type_base(); |
29 | 29 |
|
30 | | - squence_type_base(const cref_type &other, mfast::allocator *alloc); |
| 30 | + sequence_type_base(const cref_type &other, mfast::allocator *alloc); |
31 | 31 |
|
32 | | - squence_type_base(BOOST_RV_REF(squence_type_base) other) |
| 32 | + sequence_type_base(BOOST_RV_REF(sequence_type_base) other) |
33 | 33 | : alloc_(other.alloc_), instruction_(other.instruction_) { |
34 | 34 | // g++ 4.7.1 doesn't allow this member function to defined out of class |
35 | 35 | // declaration |
36 | 36 | my_storage_ = other.my_storage_; |
37 | 37 | other.instruction_ = 0; |
38 | 38 | } |
39 | 39 |
|
40 | | - squence_type_base &operator=(BOOST_RV_REF(squence_type_base) other) { |
| 40 | + sequence_type_base &operator=(BOOST_RV_REF(sequence_type_base) other) { |
41 | 41 | // g++ 4.7.1 doesn't allow this member function to defined out of class |
42 | 42 | // declaration |
43 | 43 | if (this->instruction()) |
@@ -77,92 +77,92 @@ template <typename CRef> class squence_type_base { |
77 | 77 | value_storage my_storage_; |
78 | 78 | }; |
79 | 79 |
|
80 | | -typedef squence_type_base<sequence_cref> sequence_type; |
| 80 | +typedef sequence_type_base<sequence_cref> sequence_type; |
81 | 81 |
|
82 | 82 | /////////////////////////////////////////////////////// |
83 | 83 |
|
84 | 84 | template <typename CRef> |
85 | | -inline squence_type_base<CRef>::squence_type_base( |
| 85 | +inline sequence_type_base<CRef>::sequence_type_base( |
86 | 86 | mfast::allocator *alloc, |
87 | | - typename squence_type_base<CRef>::instruction_cptr instruction, |
| 87 | + typename sequence_type_base<CRef>::instruction_cptr instruction, |
88 | 88 | value_storage *fields_storage) |
89 | 89 | : alloc_(alloc), instruction_(instruction) { |
90 | 90 | if (instruction_) |
91 | 91 | instruction_->construct_value(my_storage_, fields_storage, alloc_, false); |
92 | 92 | } |
93 | 93 |
|
94 | 94 | template <typename CRef> |
95 | | -inline squence_type_base<CRef>::squence_type_base( |
| 95 | +inline sequence_type_base<CRef>::sequence_type_base( |
96 | 96 | std::pair<mfast::allocator *, |
97 | | - typename squence_type_base<CRef>::instruction_cptr> p) |
| 97 | + typename sequence_type_base<CRef>::instruction_cptr> p) |
98 | 98 | : alloc_(p.first), instruction_(p.second) { |
99 | 99 | instruction_->construct_value(my_storage_, 0, alloc_, false); |
100 | 100 | } |
101 | 101 |
|
102 | | -template <typename CRef> inline squence_type_base<CRef>::~squence_type_base() { |
| 102 | +template <typename CRef> inline sequence_type_base<CRef>::~sequence_type_base() { |
103 | 103 | if (alloc_ && this->instruction()) |
104 | 104 | this->instruction()->destruct_value(my_storage_, alloc_); |
105 | 105 | } |
106 | 106 |
|
107 | 107 | template <typename CRef> |
108 | | -inline typename squence_type_base<CRef>::instruction_cptr |
109 | | -squence_type_base<CRef>::instruction() const { |
| 108 | +inline typename sequence_type_base<CRef>::instruction_cptr |
| 109 | +sequence_type_base<CRef>::instruction() const { |
110 | 110 | return instruction_; |
111 | 111 | } |
112 | 112 |
|
113 | 113 | template <typename CRef> |
114 | | -inline squence_type_base<CRef>::squence_type_base(const CRef &other, |
| 114 | +inline sequence_type_base<CRef>::sequence_type_base(const CRef &other, |
115 | 115 | mfast::allocator *alloc) |
116 | 116 | : alloc_(alloc), instruction_(other.instruction()) { |
117 | 117 | this->instruction()->copy_construct_value( |
118 | 118 | *field_cref_core_access::storage_of(other), my_storage_, alloc, nullptr); |
119 | 119 | } |
120 | 120 |
|
121 | 121 | template <typename CRef> |
122 | | -inline typename squence_type_base<CRef>::mref_type |
123 | | -squence_type_base<CRef>::ref() { |
| 122 | +inline typename sequence_type_base<CRef>::mref_type |
| 123 | +sequence_type_base<CRef>::ref() { |
124 | 124 | return mref_type(alloc_, &my_storage_, instruction_); |
125 | 125 | } |
126 | 126 |
|
127 | 127 | template <typename CRef> |
128 | | -inline typename squence_type_base<CRef>::mref_type |
129 | | -squence_type_base<CRef>::mref() { |
| 128 | +inline typename sequence_type_base<CRef>::mref_type |
| 129 | +sequence_type_base<CRef>::mref() { |
130 | 130 | return mref_type(alloc_, &my_storage_, instruction_); |
131 | 131 | } |
132 | 132 |
|
133 | 133 | template <typename CRef> |
134 | | -inline typename squence_type_base<CRef>::cref_type |
135 | | -squence_type_base<CRef>::ref() const { |
| 134 | +inline typename sequence_type_base<CRef>::cref_type |
| 135 | +sequence_type_base<CRef>::ref() const { |
136 | 136 | return cref_type(&my_storage_, instruction_); |
137 | 137 | } |
138 | 138 |
|
139 | 139 | template <typename CRef> |
140 | | -inline typename squence_type_base<CRef>::cref_type |
141 | | -squence_type_base<CRef>::cref() const { |
| 140 | +inline typename sequence_type_base<CRef>::cref_type |
| 141 | +sequence_type_base<CRef>::cref() const { |
142 | 142 | return cref_type(&my_storage_, instruction_); |
143 | 143 | } |
144 | 144 |
|
145 | 145 | template <typename CRef> |
146 | | -inline const char *squence_type_base<CRef>::name() const { |
| 146 | +inline const char *sequence_type_base<CRef>::name() const { |
147 | 147 | return instruction_->name(); |
148 | 148 | } |
149 | 149 |
|
150 | 150 | template <typename CRef> |
151 | | -inline mfast::allocator *squence_type_base<CRef>::allocator() const { |
| 151 | +inline mfast::allocator *sequence_type_base<CRef>::allocator() const { |
152 | 152 | return this->alloc_; |
153 | 153 | } |
154 | 154 |
|
155 | 155 | // template <typename CRef> |
156 | 156 | // inline void |
157 | | -// squence_type_base<CRef>::reset() |
| 157 | +// sequence_type_base<CRef>::reset() |
158 | 158 | // { |
159 | 159 | // my_storage_.of_array.content_ = 0; |
160 | 160 | // my_storage_.of_array.capacity_in_bytes_ = 0; |
161 | 161 | // } |
162 | 162 | // |
163 | 163 | // template <typename CRef> |
164 | 164 | // inline void |
165 | | -// squence_type_base<CRef>::ensure_valid() |
| 165 | +// sequence_type_base<CRef>::ensure_valid() |
166 | 166 | // { |
167 | 167 | // instruction_->ensure_valid_storage(my_storage_, alloc_); |
168 | 168 | // } |
|
0 commit comments