Skip to content
Snippets Groups Projects
Commit 077b608c authored by Jonathan Hanks's avatar Jonathan Hanks
Browse files

Update daqd.hh to deal with a broken FRAMECPP_VERSION_NUMBER in framecpp 2.7.0.

The FRAMECPP_VERSION_NUMBER is not properly defined in v2.7.0.  If it is empty, assume version 2.7.0.
parent 98dba497
No related branches found
No related tags found
No related merge requests found
......@@ -95,6 +95,15 @@ typedef General::SharedPtr< FrameCPP::Version::FrameH > ldas_frame_h_type;
#if !defined( FRAMECPP_VERSION )
#define FRAMECPP_VERSION "2.5.1"
#endif
#if FRAMECPP_VERSION_NUMBER + 0 == 0
/* There is a bug in FrameCPP 2.7.0 where FRAMECPP_VERSION_NUMBER is
* defined as an empty value. Try to check for this, and work around.
*/
#undef FRAMECPP_VERSION_NUMBER
#define FRAMECPP_VERSION_NUMBER 207000
#endif
#if FRAMECPP_VERSION_NUMBER >= 206000
#include <boost/shared_ptr.hpp>
typedef boost::shared_ptr< FrameCPP::Version::FrameH > ldas_frame_h_type;
......
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