Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
104d9335
authored
Feb 10, 2016
by
Marcus Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtapi_c, containers_cpp, examples: fixed vs2015 warnings
parent
0934d4e6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
14 deletions
+15
-14
containers_cpp/include/embb/containers/internal/lock_free_stack-inl.h
+2
-2
containers_cpp/test/hazard_pointer_test.cc
+1
-1
containers_cpp/test/pool_test-inl.h
+0
-1
doc/examples/containers/queues-snippet.h
+3
-2
doc/examples/containers/stack-snippet.h
+3
-2
mtapi_c/test/embb_mtapi_test_task.cc
+6
-6
No files found.
containers_cpp/include/embb/containers/internal/lock_free_stack-inl.h
View file @
104d9335
...
...
@@ -46,8 +46,8 @@ namespace internal {
}
template
<
typename
T
>
void
LockFreeStackNode
<
T
>::
SetNext
(
LockFreeStackNode
<
T
>*
next
)
{
this
->
next
=
next
;
void
LockFreeStackNode
<
T
>::
SetNext
(
LockFreeStackNode
<
T
>*
next
_to_set
)
{
this
->
next
=
next
_to_set
;
}
template
<
typename
T
>
...
...
containers_cpp/test/hazard_pointer_test.cc
View file @
104d9335
...
...
@@ -169,7 +169,7 @@ void HazardPointerTest::HazardPointerTest1ThreadMethod() {
same
=
true
;
break
;
}
bool
success
=
stack_
->
TryPush
(
allocated_object_from_different_thread
);
success
=
stack_
->
TryPush
(
allocated_object_from_different_thread
);
PT_ASSERT
(
success
==
true
);
}
PT_ASSERT
(
success_pop
==
true
);
...
...
containers_cpp/test/pool_test-inl.h
View file @
104d9335
...
...
@@ -165,7 +165,6 @@ void PoolTest<ValuePool_t>::PoolTestStatic() {
//if we allocate again, we should get those elements
for
(
int
i
=
0
;
i
!=
static_cast
<
int
>
(
indexes_to_free
.
size
());
i
++
)
{
int
element
,
index
;
index
=
ap
.
Allocate
(
element
);
PT_EXPECT
((
index
!=
-
1
));
...
...
doc/examples/containers/queues-snippet.h
View file @
104d9335
...
...
@@ -4,12 +4,12 @@ int i, j;
bool
result
=
queue
.
TryDequeue
(
i
);
//@\label{lst:queue_lst1:fail_pop}@
assert
(
result
==
false
);
for
(
i
nt
i
=
0
;
i
<=
4
;
++
i
)
{
//@\label{lst:queue_lst1:loop1}@
for
(
i
=
0
;
i
<=
4
;
++
i
)
{
//@\label{lst:queue_lst1:loop1}@
result
=
queue
.
TryEnqueue
(
i
);
//@\label{lst:queue_lst1:push}@
assert
(
result
==
true
);
}
for
(
i
nt
i
=
0
;
i
<=
4
;
++
i
)
{
//@\label{lst:queue_lst1:loop2}@
for
(
i
=
0
;
i
<=
4
;
++
i
)
{
//@\label{lst:queue_lst1:loop2}@
result
=
queue
.
TryDequeue
(
j
);
//@\label{lst:queue_lst1:pop}@
assert
(
result
==
true
&&
i
==
j
);
//@\label{lst:queue_lst1:assert}@
}
\ No newline at end of file
doc/examples/containers/stack-snippet.h
View file @
104d9335
...
...
@@ -4,12 +4,12 @@ int i, j;
bool
result
=
stack
.
TryPop
(
i
);
//@\label{lst:stack_lst1:fail_pop}@
assert
(
result
==
false
);
for
(
i
nt
i
=
0
;
i
<=
4
;
++
i
)
{
//@\label{lst:stack_lst1:loop1}@
for
(
i
=
0
;
i
<=
4
;
++
i
)
{
//@\label{lst:stack_lst1:loop1}@
result
=
stack
.
TryPush
(
i
);
//@\label{lst:stack_lst1:push}@
assert
(
result
==
true
);
}
for
(
i
nt
i
=
4
;
i
>=
0
;
--
i
)
{
//@\label{lst:stack_lst1:loop2}@
for
(
i
=
4
;
i
>=
0
;
--
i
)
{
//@\label{lst:stack_lst1:loop2}@
result
=
stack
.
TryPop
(
j
);
//@\label{lst:stack_lst1:pop}@
assert
(
result
==
true
&&
i
==
j
);
//@\label{lst:stack_lst1:assert}@
}
\ No newline at end of file
mtapi_c/test/embb_mtapi_test_task.cc
View file @
104d9335
...
...
@@ -107,7 +107,7 @@ void TaskTest::TestBasic() {
mtapi_action_hndl_t
action
;
mtapi_job_hndl_t
job
;
mtapi_task_hndl_t
task
[
100
];
in
t
ii
;
mtapi_uint_
t
ii
;
embb_mtapi_log_info
(
"running testTask...
\n
"
);
...
...
@@ -169,9 +169,9 @@ void TaskTest::TestBasic() {
job
=
mtapi_job_get
(
JOB_TEST_TASK
,
THIS_DOMAIN_ID
,
&
status
);
MTAPI_CHECK_STATUS
(
status
);
for
(
ii
=
0
;
ii
<
100
;
ii
++
)
{
for
(
ii
=
0
;
ii
<
100
u
;
ii
++
)
{
status
=
MTAPI_ERR_UNKNOWN
;
in
t
arg
=
ii
;
mtapi_uint_
t
arg
=
ii
;
task
[
ii
]
=
mtapi_task_start
(
TASK_TEST_ID
,
job
,
...
...
@@ -187,7 +187,7 @@ void TaskTest::TestBasic() {
testDoSomethingElse
();
for
(
ii
=
0
;
ii
<
100
;
ii
++
)
{
for
(
ii
=
0
;
ii
<
100
u
;
ii
++
)
{
status
=
MTAPI_ERR_UNKNOWN
;
mtapi_task_wait
(
task
[
ii
],
100000
,
&
status
);
MTAPI_CHECK_STATUS
(
status
);
...
...
@@ -227,7 +227,7 @@ void TaskTest::TestBasic() {
MTAPI_CHECK_STATUS
(
status
);
mtapi_uint_t
result
[
kTaskInstances
];
for
(
mtapi_uint_t
ii
=
0
;
ii
<
kTaskInstances
;
ii
++
)
{
for
(
ii
=
0
;
ii
<
kTaskInstances
;
ii
++
)
{
result
[
ii
]
=
kTaskInstances
+
1
;
}
...
...
@@ -245,7 +245,7 @@ void TaskTest::TestBasic() {
mtapi_task_wait
(
multiinstance_task
,
MTAPI_INFINITE
,
&
status
);
MTAPI_CHECK_STATUS
(
status
);
for
(
mtapi_uint_t
ii
=
0
;
ii
<
kTaskInstances
;
ii
++
)
{
for
(
ii
=
0
;
ii
<
kTaskInstances
;
ii
++
)
{
PT_EXPECT_EQ
(
result
[
ii
],
ii
);
}
...
...
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