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
b3be3691
authored
Mar 23, 2015
by
Marcus Winter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mtapi_c, mtapi_network_c, mtapi_opencl_c: removed compiler warnings
parent
92301c6e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
7 deletions
+11
-7
mtapi_c/test/embb_mtapi_test_task.cc
+2
-2
mtapi_network_c/src/embb_mtapi_network.c
+1
-1
mtapi_network_c/src/embb_mtapi_network_socket.c
+2
-2
mtapi_network_c/src/embb_mtapi_network_socket.h
+5
-1
mtapi_opencl_c/src/embb_mtapi_opencl.c
+1
-1
No files found.
mtapi_c/test/embb_mtapi_test_task.cc
View file @
b3be3691
...
@@ -218,11 +218,11 @@ void TaskTest::TestBasic() {
...
@@ -218,11 +218,11 @@ void TaskTest::TestBasic() {
mtapi_taskattr_init
(
&
task_attr
,
&
status
);
mtapi_taskattr_init
(
&
task_attr
,
&
status
);
MTAPI_CHECK_STATUS
(
status
);
MTAPI_CHECK_STATUS
(
status
);
const
in
t
kTaskInstances
=
5
;
const
mtapi_uint_
t
kTaskInstances
=
5
;
status
=
MTAPI_ERR_UNKNOWN
;
status
=
MTAPI_ERR_UNKNOWN
;
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_INSTANCES
,
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_INSTANCES
,
MTAPI_ATTRIBUTE_VALUE
(
kTaskInstances
),
MTAPI_ATTRIBUTE_POINTER_AS_VALUE
,
&
kTaskInstances
,
sizeof
(
mtapi_uint_t
)
,
&
status
);
&
status
);
MTAPI_CHECK_STATUS
(
status
);
MTAPI_CHECK_STATUS
(
status
);
...
...
mtapi_network_c/src/embb_mtapi_network.c
View file @
b3be3691
...
@@ -288,7 +288,7 @@ static int embb_mtapi_network_thread(void * args) {
...
@@ -288,7 +288,7 @@ static int embb_mtapi_network_thread(void * args) {
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_DETACHED
,
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_DETACHED
,
(
void
*
)
&
task_detached
,
sizeof
(
mtapi_boolean_t
),
&
local_status
);
(
void
*
)
&
task_detached
,
sizeof
(
mtapi_boolean_t
),
&
local_status
);
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_PRIORITY
,
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_PRIORITY
,
(
void
*
)
priority
,
0
,
&
local_status
);
(
void
*
)
&
priority
,
sizeof
(
int32_t
)
,
&
local_status
);
assert
(
local_status
==
MTAPI_SUCCESS
);
assert
(
local_status
==
MTAPI_SUCCESS
);
memcpy
(
&
func_void
,
&
func
,
sizeof
(
void
*
));
memcpy
(
&
func_void
,
&
func
,
sizeof
(
void
*
));
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_COMPLETE_FUNCTION
,
mtapi_taskattr_set
(
&
task_attr
,
MTAPI_TASK_COMPLETE_FUNCTION
,
...
...
mtapi_network_c/src/embb_mtapi_network_socket.c
View file @
b3be3691
...
@@ -161,9 +161,9 @@ int embb_mtapi_network_socket_select(
...
@@ -161,9 +161,9 @@ int embb_mtapi_network_socket_select(
}
}
if
(
timeout
>=
0
)
{
if
(
timeout
>=
0
)
{
err
=
select
(
max_fd
.
handle
+
1
,
&
read_set
,
NULL
,
NULL
,
&
tv
);
err
=
select
(
(
int
)
max_fd
.
handle
+
1
,
&
read_set
,
NULL
,
NULL
,
&
tv
);
}
else
{
}
else
{
err
=
select
(
max_fd
.
handle
+
1
,
&
read_set
,
NULL
,
NULL
,
NULL
);
err
=
select
(
(
int
)
max_fd
.
handle
+
1
,
&
read_set
,
NULL
,
NULL
,
NULL
);
}
}
if
(
0
==
err
)
{
if
(
0
==
err
)
{
// timeout
// timeout
...
...
mtapi_network_c/src/embb_mtapi_network_socket.h
View file @
b3be3691
...
@@ -37,7 +37,11 @@ extern "C" {
...
@@ -37,7 +37,11 @@ extern "C" {
struct
embb_mtapi_network_socket_struct
{
struct
embb_mtapi_network_socket_struct
{
#ifdef _WIN32
#ifdef _WIN32
unsigned
int
handle
;
# ifdef _WIN64
uint64_t
handle
;
# else
uint32_t
handle
;
# endif
#else
#else
int
handle
;
int
handle
;
#endif
#endif
...
...
mtapi_opencl_c/src/embb_mtapi_opencl.c
View file @
b3be3691
...
@@ -153,7 +153,7 @@ static void opencl_task_start(
...
@@ -153,7 +153,7 @@ static void opencl_task_start(
if
(
0
==
elements
)
if
(
0
==
elements
)
elements
=
1
;
elements
=
1
;
global_work_size
=
global_work_size
=
round_up
((
int
)
opencl_action
->
local_work_size
,
elements
);
round_up
((
int
)
opencl_action
->
local_work_size
,
(
int
)
elements
);
opencl_task
->
task
=
task
;
opencl_task
->
task
=
task
;
...
...
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