Skip to content
Snippets Groups Projects
Commit 29792eac authored by Florian Prill's avatar Florian Prill
Browse files

Merge branch 'bool_fix' into feature-hl

parents 78838d73 a28c16bf
No related branches found
No related tags found
No related merge requests found
......@@ -31,7 +31,7 @@ typedef enum
struct iso8601_duration
{
bool flag_std_form;
int flag_std_form;
char sign;
int64_t year;
int month;
......
......@@ -36,7 +36,7 @@ struct _juliandelta;
struct _timedelta
{
bool flag_std_form; ///< Is timedelta formatted in standard form (eg. PT30M10S) or long form (eg. PT3000S)?
int flag_std_form; ///< Is timedelta formatted in standard form (eg. PT30M10S) or long form (eg. PT3000S)?
char sign; ///< sign of time delta. Sign can be '+' or '-'.
int64_t year; ///< Year part of timedelta.
......
......@@ -957,6 +957,7 @@ contains
call c_f_pointer(c_pointer, dest)
end function newdatetimefromconstructandcopy
! @return Minimum of two date time. In case of equality we return @p a.
!
! @note This function does not return a copy of one of the arguments
......@@ -1351,6 +1352,7 @@ module mtime_timedelta
integer, parameter :: max_timedelta_str_len = 32
!
type, bind(c) :: timedelta
integer(c_int) :: flag_std_form
character(c_char) :: sign
integer(c_int64_t) :: year
integer(c_int) :: month
......
......@@ -737,9 +737,9 @@ get_date_time(const char* buffer, struct iso8601_datetime* datetimeObj, struct i
else if((stat == DURATION_MATCH_STD || stat == DURATION_MATCH_LONG) && (RAISE_YEAR_OUT_OF_BOUND_EXCEPTION == false))
{
if (stat == DURATION_MATCH_STD) /* STD: eg. P01Y05M */
durationObj->flag_std_form = true;
durationObj->flag_std_form = 1;
else /*LONG: eg. P17M */
durationObj->flag_std_form = false;
durationObj->flag_std_form = 0;
/* Set sign of duration. */
if (duObj.sign == '$')
......
......@@ -606,9 +606,9 @@ get_date_time(const char* buffer, struct iso8601_datetime* datetimeObj, struct i
else if((stat == DURATION_MATCH_STD || stat == DURATION_MATCH_LONG) && (RAISE_YEAR_OUT_OF_BOUND_EXCEPTION == false))
{
if (stat == DURATION_MATCH_STD) /* STD: eg. P01Y05M */
durationObj->flag_std_form = true;
durationObj->flag_std_form = 1;
else /*LONG: eg. P17M */
durationObj->flag_std_form = false;
durationObj->flag_std_form = 0;
/* Set sign of duration. */
if (duObj.sign == '$')
......
......@@ -70,7 +70,7 @@ newTimeDelta(const char* tds)
return NULL ;
}
duration_type_flag == 2?(td->flag_std_form = true):(td->flag_std_form = false);
duration_type_flag == 2?(td->flag_std_form = 1):(td->flag_std_form = 0);
/* IMPORTANT: Negative/Positive time delta is indicated using td->sign (-/+). year,month,day..etc are always positive integers or 0. */
td->sign = isoDuration->sign;
td->year = isoDuration->year;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment