diff options
Diffstat (limited to 'gnuradio-runtime/include')
-rw-r--r-- | gnuradio-runtime/include/gnuradio/block.h | 2 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/block_gateway.h | 4 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/logger.h.in | 16 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/math.h | 2 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/prefs.h | 2 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/pycallback_object.h | 2 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/thread/thread.h | 2 | ||||
-rw-r--r-- | gnuradio-runtime/include/gnuradio/thrift_application_base.h | 2 | ||||
-rw-r--r-- | gnuradio-runtime/include/pmt/pmt.h | 6 |
9 files changed, 19 insertions, 19 deletions
diff --git a/gnuradio-runtime/include/gnuradio/block.h b/gnuradio-runtime/include/gnuradio/block.h index 1b6f66d45b..eb547f3022 100644 --- a/gnuradio-runtime/include/gnuradio/block.h +++ b/gnuradio-runtime/include/gnuradio/block.h @@ -859,7 +859,7 @@ namespace gr { */ void notify_msg_neighbors(); - /*! \brief Make sure we dont think we are finished + /*! \brief Make sure we don't think we are finished */ void clear_finished(){ d_finished = false; } diff --git a/gnuradio-runtime/include/gnuradio/block_gateway.h b/gnuradio-runtime/include/gnuradio/block_gateway.h index bb0c26f8f2..ef218ea662 100644 --- a/gnuradio-runtime/include/gnuradio/block_gateway.h +++ b/gnuradio-runtime/include/gnuradio/block_gateway.h @@ -70,13 +70,13 @@ namespace gr { int general_work_args_noutput_items; std::vector<int> general_work_args_ninput_items; - std::vector<void *> general_work_args_input_items; //TODO this should be const void*, but swig cant int cast it right + std::vector<void *> general_work_args_input_items; //TODO this should be const void*, but swig can't int cast it right std::vector<void *> general_work_args_output_items; int general_work_args_return_value; int work_args_ninput_items; int work_args_noutput_items; - std::vector<void *> work_args_input_items; //TODO this should be const void*, but swig cant int cast it right + std::vector<void *> work_args_input_items; //TODO this should be const void*, but swig can't int cast it right std::vector<void *> work_args_output_items; int work_args_return_value; diff --git a/gnuradio-runtime/include/gnuradio/logger.h.in b/gnuradio-runtime/include/gnuradio/logger.h.in index ec3c347f9e..476371c9e5 100644 --- a/gnuradio-runtime/include/gnuradio/logger.h.in +++ b/gnuradio-runtime/include/gnuradio/logger.h.in @@ -376,7 +376,7 @@ namespace gr { /*! * \brief Class to control configuration of logger. - * This is a singleton that cna launch a thread to wathc a config file for changes + * This is a singleton that can launch a thread to watch a config file for changes * \ingroup logging */ class GR_RUNTIME_API logger_config @@ -468,7 +468,7 @@ namespace gr { /*! * \brief Retrieve a pointer to a logger by name * - * Retrives a logger pointer + * Retrieves a logger pointer * \p name. * * \param name Name of the logger for which a pointer is requested @@ -613,7 +613,7 @@ namespace gr { * * \param logger Logger to which appender will be added * \param target Std target to write 'cout' or 'cerr' (default is cout) - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_add_console_appender(logger_ptr logger, std::string target, @@ -626,7 +626,7 @@ namespace gr { * * \param logger Logger to which appender will be added * \param target Std target to write 'cout' or 'cerr' (default is cout) - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_set_console_appender(logger_ptr logger, std::string target, @@ -640,7 +640,7 @@ namespace gr { * \param logger Logger to which appender will be added * \param filename File to which log will be written * \param append Overwrite or append to log file - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_add_file_appender(logger_ptr logger, std::string filename, @@ -653,7 +653,7 @@ namespace gr { * \param logger Logger to which appender will be added * \param filename File to which log will be written * \param append Overwrite or append to log file - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_set_file_appender(logger_ptr logger, std::string filename, @@ -670,7 +670,7 @@ namespace gr { * \param bkup_index Number of files to write * \param append Overwrite or append to log file * \param mode Permissions to set on log file - * \param pattern Formating pattern for log messages + * \param pattern Formatting pattern for log messages */ GR_RUNTIME_API void logger_add_rollingfile_appender(logger_ptr logger, std::string filename, size_t filesize, int bkup_index, bool append, @@ -766,7 +766,7 @@ namespace gr { logger_ptr d_logger; public: /*! - * \brief contructor Provide name of logger to associate with this class + * \brief constructor Provide name of logger to associate with this class * \param logger_name Name of logger associated with class */ logger(std::string logger_name) { diff --git a/gnuradio-runtime/include/gnuradio/math.h b/gnuradio-runtime/include/gnuradio/math.h index d611c98c95..e60f56b594 100644 --- a/gnuradio-runtime/include/gnuradio/math.h +++ b/gnuradio-runtime/include/gnuradio/math.h @@ -49,7 +49,7 @@ namespace gr { * * This function calculates the angle of the vector (x,y) based on a * table lookup and linear interpolation. The table uses a 256 point - * table covering -45 to +45 degrees and uses symetry to determine + * table covering -45 to +45 degrees and uses symmetry to determine * the final angle value in the range of -180 to 180 degrees. Note * that this function uses the small angle approximation for values * close to zero. This routine calculates the arc tangent with an diff --git a/gnuradio-runtime/include/gnuradio/prefs.h b/gnuradio-runtime/include/gnuradio/prefs.h index 287f86cc7c..ccb4db1e20 100644 --- a/gnuradio-runtime/include/gnuradio/prefs.h +++ b/gnuradio-runtime/include/gnuradio/prefs.h @@ -39,7 +39,7 @@ namespace gr { * \brief Base class for representing user preferences a la windows INI files. * \ingroup misc * - * The real implementation is in Python, and is accessable from C++ + * The real implementation is in Python, and is accessible from C++ * via the magic of SWIG directors. */ class GR_RUNTIME_API prefs diff --git a/gnuradio-runtime/include/gnuradio/pycallback_object.h b/gnuradio-runtime/include/gnuradio/pycallback_object.h index 85a883c3d3..f0857b6c8e 100644 --- a/gnuradio-runtime/include/gnuradio/pycallback_object.h +++ b/gnuradio-runtime/include/gnuradio/pycallback_object.h @@ -42,7 +42,7 @@ public: } }; -/* template specializations for vectors that cant use pmt::mp() */ +/* template specializations for vectors that can't use pmt::mp() */ template<> pmt::pmt_t pmt_assist<std::vector<float> >::make(std::vector<float> _val) { diff --git a/gnuradio-runtime/include/gnuradio/thread/thread.h b/gnuradio-runtime/include/gnuradio/thread/thread.h index 20a94cba52..3fda5d86ce 100644 --- a/gnuradio-runtime/include/gnuradio/thread/thread.h +++ b/gnuradio-runtime/include/gnuradio/thread/thread.h @@ -64,7 +64,7 @@ namespace gr { /*! \brief Get the current thread's ID as a gr_thread_t * * We use this when setting the thread affinity or any other - * low-level thread settings. Can be called withing a GNU Radio + * low-level thread settings. Can be called within a GNU Radio * block to get a reference to its current thread ID. */ GR_RUNTIME_API gr_thread_t get_current_thread_id(); diff --git a/gnuradio-runtime/include/gnuradio/thrift_application_base.h b/gnuradio-runtime/include/gnuradio/thrift_application_base.h index d3721939a3..34622cacfe 100644 --- a/gnuradio-runtime/include/gnuradio/thrift_application_base.h +++ b/gnuradio-runtime/include/gnuradio/thrift_application_base.h @@ -174,7 +174,7 @@ private: // and since ::i() is static, this function must be static as well. static void start_application(); - // Pointer to the structure containing staticly allocated + // Pointer to the structure containing statically allocated // state information for the applicaiton_base singleton. static boost::scoped_ptr<thrift_application_base_impl > p_impl; diff --git a/gnuradio-runtime/include/pmt/pmt.h b/gnuradio-runtime/include/pmt/pmt.h index 00564cc8d3..cb2191dd87 100644 --- a/gnuradio-runtime/include/pmt/pmt.h +++ b/gnuradio-runtime/include/pmt/pmt.h @@ -314,7 +314,7 @@ PMT_API pmt_t cadddr(pmt_t pair); * ------------------------------------------------------------------------ */ -//! Return true if \p x is a tuple, othewise false. +//! Return true if \p x is a tuple, otherwise false. PMT_API bool is_tuple(pmt_t x); PMT_API pmt_t make_tuple(); @@ -348,7 +348,7 @@ PMT_API pmt_t tuple_ref(const pmt_t &tuple, size_t k); * ------------------------------------------------------------------------ */ -//! Return true if \p x is a vector, othewise false. +//! Return true if \p x is a vector, otherwise false. PMT_API bool is_vector(pmt_t x); //! Make a vector of length \p k, with initial values set to \p fill @@ -374,7 +374,7 @@ PMT_API void vector_fill(pmt_t vector, pmt_t fill); * ------------------------------------------------------------------------ */ -//! Return true if \p x is a blob, othewise false. +//! Return true if \p x is a blob, otherwise false. PMT_API bool is_blob(pmt_t x); /*! |