Skip to content

Commit

Permalink
CLN: Fix compile time warnings
Browse files Browse the repository at this point in the history
Author: yui-knk <[email protected]>

Closes pandas-dev#13643 from yui-knk/warning2 and squashes the following commits:

ee3a4fb [yui-knk] CLN: Fix compile time warnings
  • Loading branch information
yui-knk authored and jreback committed Jul 14, 2016
1 parent 084ceae commit 3f6d4bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pandas/src/datetime/np_datetime.c
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ void pandas_datetime_to_datetimestruct(npy_datetime val, PANDAS_DATETIMEUNIT fr,
}

PANDAS_DATETIMEUNIT get_datetime64_unit(PyObject *obj) {
return ((PyDatetimeScalarObject *) obj)->obmeta.base;
return (PANDAS_DATETIMEUNIT)((PyDatetimeScalarObject *) obj)->obmeta.base;
}


Expand Down
2 changes: 1 addition & 1 deletion pandas/src/ujson/python/objToJSON.c
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ static void *NpyDateTimeScalarToJSON(JSOBJ _obj, JSONTypeContext *tc, void *outV
PyDatetimeScalarObject *obj = (PyDatetimeScalarObject *) _obj;
PRINTMARK();

pandas_datetime_to_datetimestruct(obj->obval, obj->obmeta.base, &dts);
pandas_datetime_to_datetimestruct(obj->obval, (PANDAS_DATETIMEUNIT)obj->obmeta.base, &dts);
return PandasDateTimeStructToJSON(&dts, tc, outValue, _outLen);
}

Expand Down

0 comments on commit 3f6d4bd

Please sign in to comment.