Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
4b0e288f
Commit
4b0e288f
authored
Jan 03, 2020
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
util/{Const,Writable}Buffer: add `noexcept`
parent
71ace2fb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
67 additions
and
62 deletions
+67
-62
ConstBuffer.hxx
src/util/ConstBuffer.hxx
+34
-32
WritableBuffer.hxx
src/util/WritableBuffer.hxx
+33
-30
No files found.
src/util/ConstBuffer.hxx
View file @
4b0e288f
...
...
@@ -55,32 +55,33 @@ struct ConstBuffer<void> {
ConstBuffer
()
=
default
;
constexpr
ConstBuffer
(
std
::
nullptr_t
)
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
ConstBuffer
(
std
::
nullptr_t
)
noexcept
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
ConstBuffer
(
pointer_type
_data
,
size_type
_size
)
constexpr
ConstBuffer
(
pointer_type
_data
,
size_type
_size
)
noexcept
:
data
(
_data
),
size
(
_size
)
{}
constexpr
static
ConstBuffer
<
void
>
FromVoid
(
ConstBuffer
<
void
>
other
)
{
constexpr
static
ConstBuffer
<
void
>
FromVoid
(
ConstBuffer
<
void
>
other
)
noexcept
{
return
other
;
}
constexpr
ConstBuffer
<
void
>
ToVoid
()
const
{
constexpr
ConstBuffer
<
void
>
ToVoid
()
const
noexcept
{
return
*
this
;
}
constexpr
bool
IsNull
()
const
{
constexpr
bool
IsNull
()
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
noexcept
{
return
data
!=
nullptr
;
}
constexpr
bool
empty
()
const
{
constexpr
bool
empty
()
const
noexcept
{
return
size
==
0
;
}
};
...
...
@@ -104,26 +105,27 @@ struct ConstBuffer {
ConstBuffer
()
=
default
;
constexpr
ConstBuffer
(
std
::
nullptr_t
)
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
ConstBuffer
(
std
::
nullptr_t
)
noexcept
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
ConstBuffer
(
pointer_type
_data
,
size_type
_size
)
constexpr
ConstBuffer
(
pointer_type
_data
,
size_type
_size
)
noexcept
:
data
(
_data
),
size
(
_size
)
{}
constexpr
ConstBuffer
(
pointer_type
_data
,
pointer_type
_end
)
constexpr
ConstBuffer
(
pointer_type
_data
,
pointer_type
_end
)
noexcept
:
data
(
_data
),
size
(
_end
-
_data
)
{}
/**
* Convert array to ConstBuffer instance.
*/
template
<
size_type
_size
>
constexpr
ConstBuffer
(
const
T
(
&
_data
)[
_size
])
constexpr
ConstBuffer
(
const
T
(
&
_data
)[
_size
])
noexcept
:
data
(
_data
),
size
(
_size
)
{}
/**
* Cast a ConstBuffer<void> to a ConstBuffer<T>, rounding down
* to the next multiple of T's size.
*/
static
constexpr
ConstBuffer
<
T
>
FromVoidFloor
(
ConstBuffer
<
void
>
other
)
{
static
constexpr
ConstBuffer
<
T
>
FromVoidFloor
(
ConstBuffer
<
void
>
other
)
noexcept
{
static_assert
(
sizeof
(
T
)
>
0
,
"Empty base type"
);
return
ConstBuffer
<
T
>
(
pointer_type
(
other
.
data
),
other
.
size
/
sizeof
(
T
));
...
...
@@ -138,7 +140,7 @@ struct ConstBuffer {
#ifdef NDEBUG
constexpr
#endif
static
ConstBuffer
<
T
>
FromVoid
(
ConstBuffer
<
void
>
other
)
{
static
ConstBuffer
<
T
>
FromVoid
(
ConstBuffer
<
void
>
other
)
noexcept
{
static_assert
(
sizeof
(
T
)
>
0
,
"Empty base type"
);
#ifndef NDEBUG
assert
(
other
.
size
%
sizeof
(
T
)
==
0
);
...
...
@@ -146,24 +148,24 @@ struct ConstBuffer {
return
FromVoidFloor
(
other
);
}
constexpr
ConstBuffer
<
void
>
ToVoid
()
const
{
constexpr
ConstBuffer
<
void
>
ToVoid
()
const
noexcept
{
static_assert
(
sizeof
(
T
)
>
0
,
"Empty base type"
);
return
ConstBuffer
<
void
>
(
data
,
size
*
sizeof
(
T
));
}
constexpr
bool
IsNull
()
const
{
constexpr
bool
IsNull
()
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
noexcept
{
return
data
!=
nullptr
;
}
constexpr
bool
empty
()
const
{
constexpr
bool
empty
()
const
noexcept
{
return
size
==
0
;
}
...
...
@@ -177,26 +179,26 @@ struct ConstBuffer {
return
false
;
}
constexpr
iterator
begin
()
const
{
constexpr
iterator
begin
()
const
noexcept
{
return
data
;
}
constexpr
iterator
end
()
const
{
constexpr
iterator
end
()
const
noexcept
{
return
data
+
size
;
}
constexpr
const_iterator
cbegin
()
const
{
constexpr
const_iterator
cbegin
()
const
noexcept
{
return
data
;
}
constexpr
const_iterator
cend
()
const
{
constexpr
const_iterator
cend
()
const
noexcept
{
return
data
+
size
;
}
#ifdef NDEBUG
constexpr
#endif
reference_type
operator
[](
size_type
i
)
const
{
reference_type
operator
[](
size_type
i
)
const
noexcept
{
#ifndef NDEBUG
assert
(
i
<
size
);
#endif
...
...
@@ -211,7 +213,7 @@ struct ConstBuffer {
#ifdef NDEBUG
constexpr
#endif
reference_type
front
()
const
{
reference_type
front
()
const
noexcept
{
#ifndef NDEBUG
assert
(
!
empty
());
#endif
...
...
@@ -225,7 +227,7 @@ struct ConstBuffer {
#ifdef NDEBUG
constexpr
#endif
reference_type
back
()
const
{
reference_type
back
()
const
noexcept
{
#ifndef NDEBUG
assert
(
!
empty
());
#endif
...
...
@@ -236,7 +238,7 @@ struct ConstBuffer {
* Remove the first element (by moving the head pointer, does
* not actually modify the buffer). Buffer must not be empty.
*/
void
pop_front
()
{
void
pop_front
()
noexcept
{
#ifndef NDEBUG
assert
(
!
empty
());
#endif
...
...
@@ -249,7 +251,7 @@ struct ConstBuffer {
* Remove the last element (by moving the tail pointer, does
* not actually modify the buffer). Buffer must not be empty.
*/
void
pop_back
()
{
void
pop_back
()
noexcept
{
#ifndef NDEBUG
assert
(
!
empty
());
#endif
...
...
@@ -261,13 +263,13 @@ struct ConstBuffer {
* Remove the first element and return a reference to it.
* Buffer must not be empty.
*/
reference_type
shift
()
{
reference_type
shift
()
noexcept
{
reference_type
result
=
front
();
pop_front
();
return
result
;
}
void
skip_front
(
size_type
n
)
{
void
skip_front
(
size_type
n
)
noexcept
{
#ifndef NDEBUG
assert
(
size
>=
n
);
#endif
...
...
@@ -280,7 +282,7 @@ struct ConstBuffer {
* Move the front pointer to the given address, and adjust the
* size attribute to retain the old end address.
*/
void
MoveFront
(
pointer_type
new_data
)
{
void
MoveFront
(
pointer_type
new_data
)
noexcept
{
#ifndef NDEBUG
assert
(
IsNull
()
==
(
new_data
==
nullptr
));
assert
(
new_data
<=
end
());
...
...
@@ -294,7 +296,7 @@ struct ConstBuffer {
* Move the end pointer to the given address (by adjusting the
* size).
*/
void
SetEnd
(
pointer_type
new_end
)
{
void
SetEnd
(
pointer_type
new_end
)
noexcept
{
#ifndef NDEBUG
assert
(
IsNull
()
==
(
new_end
==
nullptr
));
assert
(
new_end
>=
begin
());
...
...
src/util/WritableBuffer.hxx
View file @
4b0e288f
...
...
@@ -56,28 +56,29 @@ struct WritableBuffer<void> {
WritableBuffer
()
=
default
;
constexpr
WritableBuffer
(
std
::
nullptr_t
)
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
WritableBuffer
(
std
::
nullptr_t
)
noexcept
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
WritableBuffer
(
pointer_type
_data
,
size_type
_size
)
constexpr
WritableBuffer
(
pointer_type
_data
,
size_type
_size
)
noexcept
:
data
(
_data
),
size
(
_size
)
{}
constexpr
operator
ConstBuffer
<
void
>
()
const
noexcept
{
return
{
data
,
size
};
}
constexpr
bool
IsNull
()
const
{
constexpr
bool
IsNull
()
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
noexcept
{
return
data
!=
nullptr
;
}
constexpr
bool
empty
()
const
{
constexpr
bool
empty
()
const
noexcept
{
return
size
==
0
;
}
};
...
...
@@ -103,19 +104,21 @@ struct WritableBuffer {
WritableBuffer
()
=
default
;
constexpr
WritableBuffer
(
std
::
nullptr_t
)
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
WritableBuffer
(
std
::
nullptr_t
)
noexcept
:
data
(
nullptr
),
size
(
0
)
{}
constexpr
WritableBuffer
(
pointer_type
_data
,
size_type
_size
)
constexpr
WritableBuffer
(
pointer_type
_data
,
size_type
_size
)
noexcept
:
data
(
_data
),
size
(
_size
)
{}
constexpr
WritableBuffer
(
pointer_type
_data
,
pointer_type
_end
)
constexpr
WritableBuffer
(
pointer_type
_data
,
pointer_type
_end
)
noexcept
:
data
(
_data
),
size
(
_end
-
_data
)
{}
/**
* Convert array to WritableBuffer instance.
*/
template
<
size_type
_size
>
constexpr
WritableBuffer
(
T
(
&
_data
)[
_size
])
constexpr
WritableBuffer
(
T
(
&
_data
)[
_size
])
noexcept
:
data
(
_data
),
size
(
_size
)
{}
constexpr
operator
ConstBuffer
<
T
>
()
const
noexcept
{
...
...
@@ -126,7 +129,7 @@ struct WritableBuffer {
* Cast a WritableBuffer<void> to a WritableBuffer<T>,
* rounding down to the next multiple of T's size.
*/
static
constexpr
WritableBuffer
<
T
>
FromVoidFloor
(
WritableBuffer
<
void
>
other
)
{
static
constexpr
WritableBuffer
<
T
>
FromVoidFloor
(
WritableBuffer
<
void
>
other
)
noexcept
{
static_assert
(
sizeof
(
T
)
>
0
,
"Empty base type"
);
return
WritableBuffer
<
T
>
(
pointer_type
(
other
.
data
),
other
.
size
/
sizeof
(
T
));
...
...
@@ -141,7 +144,7 @@ struct WritableBuffer {
#ifdef NDEBUG
constexpr
#endif
static
WritableBuffer
<
T
>
FromVoid
(
WritableBuffer
<
void
>
other
)
{
static
WritableBuffer
<
T
>
FromVoid
(
WritableBuffer
<
void
>
other
)
noexcept
{
static_assert
(
sizeof
(
T
)
>
0
,
"Empty base type"
);
#ifndef NDEBUG
assert
(
other
.
size
%
sizeof
(
T
)
==
0
);
...
...
@@ -149,47 +152,47 @@ struct WritableBuffer {
return
FromVoidFloor
(
other
);
}
constexpr
WritableBuffer
<
void
>
ToVoid
()
const
{
constexpr
WritableBuffer
<
void
>
ToVoid
()
const
noexcept
{
static_assert
(
sizeof
(
T
)
>
0
,
"Empty base type"
);
return
WritableBuffer
<
void
>
(
data
,
size
*
sizeof
(
T
));
}
constexpr
bool
IsNull
()
const
{
constexpr
bool
IsNull
()
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
==
(
std
::
nullptr_t
)
const
noexcept
{
return
data
==
nullptr
;
}
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
{
constexpr
bool
operator
!=
(
std
::
nullptr_t
)
const
noexcept
{
return
data
!=
nullptr
;
}
constexpr
bool
empty
()
const
{
constexpr
bool
empty
()
const
noexcept
{
return
size
==
0
;
}
constexpr
iterator
begin
()
const
{
constexpr
iterator
begin
()
const
noexcept
{
return
data
;
}
constexpr
iterator
end
()
const
{
constexpr
iterator
end
()
const
noexcept
{
return
data
+
size
;
}
constexpr
const_iterator
cbegin
()
const
{
constexpr
const_iterator
cbegin
()
const
noexcept
{
return
data
;
}
constexpr
const_iterator
cend
()
const
{
constexpr
const_iterator
cend
()
const
noexcept
{
return
data
+
size
;
}
#ifdef NDEBUG
constexpr
#endif
reference_type
operator
[](
size_type
i
)
const
{
reference_type
operator
[](
size_type
i
)
const
noexcept
{
#ifndef NDEBUG
assert
(
i
<
size
);
#endif
...
...
@@ -204,7 +207,7 @@ struct WritableBuffer {
#ifdef NDEBUG
constexpr
#endif
reference_type
front
()
const
{
reference_type
front
()
const
noexcept
{
#ifndef NDEBUG
assert
(
!
empty
());
#endif
...
...
@@ -218,7 +221,7 @@ struct WritableBuffer {
#ifdef NDEBUG
constexpr
#endif
reference_type
back
()
const
{
reference_type
back
()
const
noexcept
{
#ifndef NDEBUG
assert
(
!
empty
());
#endif
...
...
@@ -229,7 +232,7 @@ struct WritableBuffer {
* Remove the first element (by moving the head pointer, does
* not actually modify the buffer). Buffer must not be empty.
*/
void
pop_front
()
{
void
pop_front
()
noexcept
{
assert
(
!
empty
());
++
data
;
...
...
@@ -240,7 +243,7 @@ struct WritableBuffer {
* Remove the last element (by moving the tail pointer, does
* not actually modify the buffer). Buffer must not be empty.
*/
void
pop_back
()
{
void
pop_back
()
noexcept
{
assert
(
!
empty
());
--
size
;
...
...
@@ -250,13 +253,13 @@ struct WritableBuffer {
* Remove the first element and return a reference to it.
* Buffer must not be empty.
*/
reference_type
shift
()
{
reference_type
shift
()
noexcept
{
reference_type
result
=
front
();
pop_front
();
return
result
;
}
void
skip_front
(
size_type
n
)
{
void
skip_front
(
size_type
n
)
noexcept
{
#ifndef NDEBUG
assert
(
size
>=
n
);
#endif
...
...
@@ -269,7 +272,7 @@ struct WritableBuffer {
* Move the front pointer to the given address, and adjust the
* size attribute to retain the old end address.
*/
void
MoveFront
(
pointer_type
new_data
)
{
void
MoveFront
(
pointer_type
new_data
)
noexcept
{
#ifndef NDEBUG
assert
(
IsNull
()
==
(
new_data
==
nullptr
));
assert
(
new_data
<=
end
());
...
...
@@ -283,7 +286,7 @@ struct WritableBuffer {
* Move the end pointer to the given address (by adjusting the
* size).
*/
void
SetEnd
(
pointer_type
new_end
)
{
void
SetEnd
(
pointer_type
new_end
)
noexcept
{
#ifndef NDEBUG
assert
(
IsNull
()
==
(
new_end
==
nullptr
));
assert
(
new_end
>=
begin
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment