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
d513c69c
authored
Mar 11, 2015
by
Bernhard Gatzhammer
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'embb422_revisitduration' into development
parents
66c7ea51
da7422bd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
base_cpp/src/duration.cc
+5
-5
No files found.
base_cpp/src/duration.cc
View file @
d513c69c
...
@@ -44,12 +44,12 @@ void internal::Tick::CheckExceptions(int status, const char* msg) {
...
@@ -44,12 +44,12 @@ void internal::Tick::CheckExceptions(int status, const char* msg) {
}
}
}
}
int
internal
::
Seconds
::
Set
(
embb_duration_t
&
duration
,
int
internal
::
Seconds
::
Set
(
embb_duration_t
&
duration
,
unsigned
long
long
ticks
)
{
unsigned
long
long
ticks
)
{
return
embb_duration_set_seconds
(
&
duration
,
ticks
);
return
embb_duration_set_seconds
(
&
duration
,
ticks
);
}
}
void
internal
::
Seconds
::
SetAndCheck
(
embb_duration_t
&
duration
,
void
internal
::
Seconds
::
SetAndCheck
(
embb_duration_t
&
duration
,
unsigned
long
long
ticks
)
{
unsigned
long
long
ticks
)
{
int
status
=
Set
(
duration
,
ticks
);
int
status
=
Set
(
duration
,
ticks
);
CheckExceptions
(
status
,
"Setting duration from seconds"
);
CheckExceptions
(
status
,
"Setting duration from seconds"
);
...
@@ -71,7 +71,7 @@ unsigned long long internal::Seconds::Max() {
...
@@ -71,7 +71,7 @@ unsigned long long internal::Seconds::Max() {
return
EMBB_DURATION_MAX_SECONDS
;
return
EMBB_DURATION_MAX_SECONDS
;
}
}
int
internal
::
Milliseconds
::
Set
(
embb_duration_t
&
duration
,
int
internal
::
Milliseconds
::
Set
(
embb_duration_t
&
duration
,
unsigned
long
long
ticks
)
{
unsigned
long
long
ticks
)
{
return
embb_duration_set_milliseconds
(
&
duration
,
ticks
);
return
embb_duration_set_milliseconds
(
&
duration
,
ticks
);
}
}
...
@@ -107,7 +107,7 @@ unsigned long long internal::Milliseconds::Max() {
...
@@ -107,7 +107,7 @@ unsigned long long internal::Milliseconds::Max() {
#endif
#endif
}
}
int
internal
::
Microseconds
::
Set
(
embb_duration_t
&
duration
,
int
internal
::
Microseconds
::
Set
(
embb_duration_t
&
duration
,
unsigned
long
long
ticks
)
{
unsigned
long
long
ticks
)
{
return
embb_duration_set_microseconds
(
&
duration
,
ticks
);
return
embb_duration_set_microseconds
(
&
duration
,
ticks
);
}
}
...
@@ -145,7 +145,7 @@ unsigned long long internal::Microseconds::Max() {
...
@@ -145,7 +145,7 @@ unsigned long long internal::Microseconds::Max() {
#endif
#endif
}
}
int
internal
::
Nanoseconds
::
Set
(
embb_duration_t
&
duration
,
int
internal
::
Nanoseconds
::
Set
(
embb_duration_t
&
duration
,
unsigned
long
long
ticks
)
{
unsigned
long
long
ticks
)
{
return
embb_duration_set_nanoseconds
(
&
duration
,
ticks
);
return
embb_duration_set_nanoseconds
(
&
duration
,
ticks
);
}
}
...
...
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