Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated elements (again) #1423

Closed
skliper opened this issue Apr 27, 2021 · 0 comments · Fixed by #1567 or #1584
Closed

Remove deprecated elements (again) #1423

skliper opened this issue Apr 27, 2021 · 0 comments · Fixed by #1567 or #1584

Comments

@skliper
Copy link
Contributor

skliper commented Apr 27, 2021

Is your feature request related to a problem? Please describe.
Somehow #1240 got reverted in a few locations (possible merge strangeness):

/* Compatibility for error names which have been updated */
#ifndef CFE_OMIT_DEPRECATED_6_8
#define CFE_ES_ERR_TASKID CFE_ES_ERR_RESOURCEID_NOT_VALID
#define CFE_ES_ERR_APPID CFE_ES_ERR_RESOURCEID_NOT_VALID
#define CFE_ES_ERR_MEM_HANDLE CFE_ES_ERR_RESOURCEID_NOT_VALID
#define CFE_ES_ERR_APPNAME CFE_ES_ERR_NAME_NOT_FOUND
#define CFE_ES_CDS_NOT_FOUND_ERR CFE_ES_ERR_NAME_NOT_FOUND
#define CFE_ES_CDS_REGISTRY_FULL CFE_ES_NO_RESOURCE_IDS_AVAILABLE
#endif /* CFE_OMIT_DEPRECATED_6_8 */

#ifndef CFE_OMIT_DEPRECATED_6_8
/** \brief Deperecated type to minimize required changes */
typedef CFE_SB_Buffer_t CFE_SB_Msg_t;
/** \brief Deperecated type to minimize required changes */
typedef CFE_MSG_CommandHeader_t CFE_SB_CmdHdr_t;
/** \brief Deperecated type to minimize required changes */
typedef CFE_MSG_TelemetryHeader_t CFE_SB_TlmHdr_t;
#define CFE_SB_CMD_HDR_SIZE (sizeof(CFE_MSG_CommandHeader_t)) /**< \brief Size of command header */
#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_MSG_TelemetryHeader_t)) /**< \brief Size of telemetry header */
/** \brief Pointer to an SB Message */
typedef CFE_MSG_Message_t *CFE_SB_MsgPtr_t;
/** \brief CFE_SB_MsgPayloadPtr_t defined as an opaque pointer to a message Payload portion */
typedef uint8 *CFE_SB_MsgPayloadPtr_t;
#define CFE_SB_Default_Qos CFE_SB_DEFAULT_QOS /**< \deprecated use CFE_SB_DEFAULT_QOS */
#define CFE_SB_CMD_HDR_SIZE (sizeof(CFE_MSG_CommandHeader_t)) /**< \brief Size of command header */
#define CFE_SB_TLM_HDR_SIZE (sizeof(CFE_MSG_TelemetryHeader_t)) /**< \brief Size of telemetry header */
#endif /* CFE_OMIT_DEPRECATED_6_8 */

Describe the solution you'd like
Remove. Again.

Describe alternatives you've considered
None

Additional context
Code review

Requester Info
Jacob Hageman - NASA/GSFC

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants