sdr
/
gr-gsm
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed assert.h as it caused more problems than it was worth. Fixes #7

This commit is contained in:
ptrkrysik 2014-12-02 19:05:36 +01:00
parent 529895b14c
commit d57745d31f
2 changed files with 1 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lib/receiver/assert.h
View File

@ -1,68 +0,0 @@
/* -*- c++ -*- */
/*
* @file
* @author Piotr Krysik <ptrkrysik@gmail.com>
* @section LICENSE
*
* Gr-gsm is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3, or (at your option)
* any later version.
*
* Gr-gsm is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with gr-gsm; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA.
*/
#ifndef ASSERT_H
#define ASSERT_H
#include "stdio.h"
#include <iostream>
//#define NDEBUG
/**@name Macros for standard messages. */
//@{
#define COUT(text) { std::cout << text << std::endl; }
#define CERR(text) { std::cerr << __FILE__ << ":" << __LINE__ << ": " << text; }
#ifdef NDEBUG
#define DCOUT(text) {}
#define OBJDCOUT(text) {}
#else
#define DCOUT(text) { CERR(text); }
#define OBJDCOUT(text) { DCOUT(this << " " << text); }
#endif
//@}
/** This is thrown by assert() so that gdb can catch it. */
class assertion
{
public:
assertion() {
fprintf( stderr,"Try setting a breakpoint @ %s:%u.\n",__FILE__,__LINE__ );
return;
}
};
#ifdef NDEBUG
#define assert(EXPR) {};
#else
/** This replaces the regular assert() with a C++ exception. */
#include "stdio.h"
#define assert(E) { if (!(E)) { fprintf(stderr,"%s:%u failed assertion '%s'\n",__FILE__,__LINE__,#E); throw Assertion(); } }
#endif
#endif

3
lib/receiver/receiver_impl.cc
View File

@ -38,7 +38,6 @@
#include <sch.h>
#include <iostream>
#include <iomanip>
#include <assert.h>
#include <boost/scoped_ptr.hpp>
//files included for debuging
@ -258,7 +257,7 @@ receiver_impl::work(int noutput_items,
d_state = fcch_search;
pmt::pmt_t msg = pmt::make_tuple(pmt::mp("freq_offset"),pmt::from_double(0.0),pmt::mp("sync_loss"));
message_port_pub(pmt::mp("measurements"), msg);
DCOUT("Re-Synchronization!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
//DCOUT("Re-Synchronization!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}
}
break;