Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
B
brpc
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
brpc
Commits
8ff49b30
Unverified
Commit
8ff49b30
authored
Nov 30, 2020
by
jamesge
Committed by
GitHub
Nov 30, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1291 from lrita/l_m
make butil::ScopedVector<T> support std::initializer_list
parents
29ab8982
1c02d480
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
0 deletions
+14
-0
scoped_vector.h
src/butil/memory/scoped_vector.h
+3
-0
scoped_vector_unittest.cc
test/scoped_vector_unittest.cc
+11
-0
No files found.
src/butil/memory/scoped_vector.h
View file @
8ff49b30
...
@@ -38,6 +38,9 @@ class ScopedVector {
...
@@ -38,6 +38,9 @@ class ScopedVector {
ScopedVector
()
{}
ScopedVector
()
{}
~
ScopedVector
()
{
clear
();
}
~
ScopedVector
()
{
clear
();
}
ScopedVector
(
RValue
other
)
{
swap
(
*
other
.
object
);
}
ScopedVector
(
RValue
other
)
{
swap
(
*
other
.
object
);
}
#if __cplusplus >= 201103L // >= C++11
ScopedVector
(
std
::
initializer_list
<
value_type
>
il
)
:
v_
(
il
)
{}
#endif
ScopedVector
&
operator
=
(
RValue
rhs
)
{
ScopedVector
&
operator
=
(
RValue
rhs
)
{
swap
(
*
rhs
.
object
);
swap
(
*
rhs
.
object
);
...
...
test/scoped_vector_unittest.cc
View file @
8ff49b30
...
@@ -203,6 +203,17 @@ TEST(ScopedVectorTest, Scope) {
...
@@ -203,6 +203,17 @@ TEST(ScopedVectorTest, Scope) {
EXPECT_EQ
(
LC_DESTROYED
,
watcher
.
life_cycle_state
());
EXPECT_EQ
(
LC_DESTROYED
,
watcher
.
life_cycle_state
());
}
}
TEST
(
ScopedVectorTest
,
Scope2
)
{
LifeCycleWatcher
watcher
;
EXPECT_EQ
(
LC_INITIAL
,
watcher
.
life_cycle_state
());
{
butil
::
ScopedVector
<
LifeCycleObject
>
scoped_vector
{
watcher
.
NewLifeCycleObject
()
};
EXPECT_EQ
(
LC_CONSTRUCTED
,
watcher
.
life_cycle_state
());
EXPECT_TRUE
(
watcher
.
IsWatching
(
scoped_vector
.
back
()));
}
EXPECT_EQ
(
LC_DESTROYED
,
watcher
.
life_cycle_state
());
}
TEST
(
ScopedVectorTest
,
MoveConstruct
)
{
TEST
(
ScopedVectorTest
,
MoveConstruct
)
{
LifeCycleWatcher
watcher
;
LifeCycleWatcher
watcher
;
EXPECT_EQ
(
LC_INITIAL
,
watcher
.
life_cycle_state
());
EXPECT_EQ
(
LC_INITIAL
,
watcher
.
life_cycle_state
());
...
...
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