Fix for Windows build API exports.

This commit is contained in:
Hoernchen 2012-07-16 15:22:14 -07:00 committed by Nick Foster
parent 0a1c49f1fc
commit d2ec78c506
4 changed files with 8 additions and 8 deletions

View File

@ -24,17 +24,18 @@
#define INCLUDED_AIR_MODES_PREAMBLE_H #define INCLUDED_AIR_MODES_PREAMBLE_H
#include <gr_block.h> #include <gr_block.h>
#include <air_modes_api.h>
class air_modes_preamble; class air_modes_preamble;
typedef boost::shared_ptr<air_modes_preamble> air_modes_preamble_sptr; typedef boost::shared_ptr<air_modes_preamble> air_modes_preamble_sptr;
air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db); AIR_MODES_API air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db);
/*! /*!
* \brief mode select preamble detection * \brief mode select preamble detection
* \ingroup block * \ingroup block
*/ */
class air_modes_preamble : public gr_block class AIR_MODES_API air_modes_preamble : public gr_block
{ {
private: private:
friend air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db); friend air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db);

View File

@ -25,17 +25,18 @@
#include <gr_sync_block.h> #include <gr_sync_block.h>
#include <gr_msg_queue.h> #include <gr_msg_queue.h>
#include <air_modes_api.h>
class air_modes_slicer; class air_modes_slicer;
typedef boost::shared_ptr<air_modes_slicer> air_modes_slicer_sptr; typedef boost::shared_ptr<air_modes_slicer> air_modes_slicer_sptr;
air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue); AIR_MODES_API air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue);
/*! /*!
* \brief mode select slicer detection * \brief mode select slicer detection
* \ingroup block * \ingroup block
*/ */
class air_modes_slicer : public gr_sync_block class AIR_MODES_API air_modes_slicer : public gr_sync_block
{ {
private: private:
friend air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue); friend air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue);

View File

@ -29,9 +29,8 @@
#include <string.h> #include <string.h>
#include <iostream> #include <iostream>
#include <gr_tags.h> #include <gr_tags.h>
#include <air_modes_api.h>
AIR_MODES_API air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db) air_modes_preamble_sptr air_make_modes_preamble(int channel_rate, float threshold_db)
{ {
return air_modes_preamble_sptr (new air_modes_preamble(channel_rate, threshold_db)); return air_modes_preamble_sptr (new air_modes_preamble(channel_rate, threshold_db));
} }

View File

@ -32,7 +32,6 @@
#include <modes_crc.h> #include <modes_crc.h>
#include <iostream> #include <iostream>
#include <gr_tags.h> #include <gr_tags.h>
#include <air_modes_api.h>
extern "C" extern "C"
{ {
@ -40,7 +39,7 @@ extern "C"
#include <string.h> #include <string.h>
} }
AIR_MODES_API air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue) air_modes_slicer_sptr air_make_modes_slicer(int channel_rate, gr_msg_queue_sptr queue)
{ {
return air_modes_slicer_sptr (new air_modes_slicer(channel_rate, queue)); return air_modes_slicer_sptr (new air_modes_slicer(channel_rate, queue));
} }