Merge branch 'master' into parse

This commit is contained in:
Nick Foster
2012-07-16 15:24:35 -07:00
5 changed files with 12 additions and 11 deletions

View File

@@ -29,9 +29,8 @@
#include <string.h>
#include <iostream>
#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));
}

View File

@@ -32,7 +32,6 @@
#include <modes_crc.h>
#include <iostream>
#include <gr_tags.h>
#include <air_modes_api.h>
extern "C"
{
@@ -40,7 +39,7 @@ extern "C"
#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));
}