Skip to content

Commit

Permalink
Issue #323: Add app version to Catena::Catena()
Browse files Browse the repository at this point in the history
  • Loading branch information
terrillmoore committed Nov 22, 2021
1 parent 312362a commit f8109ac
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
18 changes: 14 additions & 4 deletions src/Catena.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,25 @@ Copyright notice:

namespace McciCatena {

///
/// \brief the top-level abstract Catena object
///
class Catena : public CATENA_H_SUPER_
{
public:
/// \brief the super class to be used depends on the targeted Catena.
using Super = CATENA_H_SUPER_;

// no specific constructor.
Catena() {};

// uses default destructor
///
/// \brief the constructor sets the version, if one is supplied.
///
/// \param[in] appVersion, if supplied is an McciCatena::Version_t
/// object which specifies the version of the application.
///
Catena(Version_t appVersion = Version_t(0))
{
this->setAppVersion(appVersion);
}

// neither copyable nor movable
Catena(const Catena&) = delete;
Expand Down
3 changes: 2 additions & 1 deletion src/CatenaBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,6 @@ class CatenaBase
);
};


///
/// \brief The platform description object represents common info about any Catena variant
///
Expand All @@ -775,6 +774,7 @@ class CatenaBase
/// The platforms are organized as a tree; each node has a pointer to
/// a parent node which is a more general version of the same platform.
///

struct CATENA_PLATFORM
{
MCCIADK_GUID_WIRE Guid; ///< the platform GUID
Expand Down Expand Up @@ -847,6 +847,7 @@ inline uint32_t CatenaBase::GetPlatformFlags(void)
///
/// \see ::gk_WellKnownCpuBindings[], CATENA_PLATFORM
///

struct CatenaBase::CPUID_PLATFORM_MAP
{
CatenaBase::UniqueID_buffer_t CpuID; ///< the CPU ID to match
Expand Down

0 comments on commit f8109ac

Please sign in to comment.