diff options
Diffstat (limited to 'include/gras')
-rw-r--r-- | include/gras/block.hpp | 4 | ||||
-rw-r--r-- | include/gras/gras.hpp | 8 | ||||
-rw-r--r-- | include/gras/tags.hpp | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/include/gras/block.hpp b/include/gras/block.hpp index 25d2993..30d7ce4 100644 --- a/include/gras/block.hpp +++ b/include/gras/block.hpp @@ -182,9 +182,9 @@ struct GRAS_API Block : Element * Deal with tag handling and tag configuration ******************************************************************/ - uint64_t nitems_read(const size_t which_input); + item_index_t nitems_read(const size_t which_input); - uint64_t nitems_written(const size_t which_output); + item_index_t nitems_written(const size_t which_output); //! Send a tag to the downstream on the given output port void post_output_tag(const size_t which_output, const Tag &tag); diff --git a/include/gras/gras.hpp b/include/gras/gras.hpp index bbeffba..ebf1d75 100644 --- a/include/gras/gras.hpp +++ b/include/gras/gras.hpp @@ -37,6 +37,8 @@ #endif #endif +#define GRAS_DLL //always build a dll + // Now we use the generic helper definitions above to define GRAS_API and GRAS_LOCAL. // GRAS_API is used for the public API symbols. It either DLL imports or DLL exports (or does nothing for static build) // GRAS_LOCAL is used for non-api symbols. @@ -66,4 +68,10 @@ #define GRAS_FORCE_INLINE inline #endif +namespace gras +{ + //! Typedef for absolute item indexes + typedef unsigned long long item_index_t; +} + #endif /*INCLUDED_GRAS_GRAS_HPP*/ diff --git a/include/gras/tags.hpp b/include/gras/tags.hpp index 9faa667..169957c 100644 --- a/include/gras/tags.hpp +++ b/include/gras/tags.hpp @@ -20,7 +20,6 @@ #include <gras/gras.hpp> #include <boost/operators.hpp> #include <PMC/PMC.hpp> -#include <boost/cstdint.hpp> namespace gras { @@ -31,10 +30,10 @@ struct GRAS_API Tag : boost::less_than_comparable<Tag> Tag(void); //! Make a tag from parameters to initialize the members - Tag(const uint64_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid = PMCC()); + Tag(const item_index_t &offset, const PMCC &key, const PMCC &value, const PMCC &srcid = PMCC()); //! the absolute item count associated with this tag - boost::uint64_t offset; + item_index_t offset; //! A symbolic name identifying the type of tag PMCC key; |