Fixes to allow Compilation using VC++ 12

Some minor fixes and tweaks to allow compilation under Visual C++ 12.
This doesn't include changes that I need to make to the build
generation.
This commit is contained in:
Chris Motch
2015-01-24 22:01:47 -05:00
parent f1f71c6080
commit 1ed7d95193
5 changed files with 8 additions and 7 deletions
+2 -2
View File
@@ -88,7 +88,7 @@ void SDRPostThread::threadMain() {
iirfilt_crcf_execute_block(dcFilter, &fpData[0], dataSize, &dataOut[0]);
if (iqDataOutQueue != NULL) {
if (iqDataOutQueue.load() != NULL) {
DemodulatorThreadIQData *pipeDataOut = new DemodulatorThreadIQData;
pipeDataOut->frequency = data_in->frequency;
@@ -97,7 +97,7 @@ void SDRPostThread::threadMain() {
iqDataOutQueue.load()->push(pipeDataOut);
}
if (iqVisualQueue != NULL && iqVisualQueue.load()->empty()) {
if (iqVisualQueue.load() != NULL && iqVisualQueue.load()->empty()) {
if (visualDataOut->data.size() < num_vis_samples) {
if (visualDataOut->data.capacity() < num_vis_samples) {
visualDataOut->data.reserve(num_vis_samples);