diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-04 09:22:25 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-04 09:22:25 -0500 |
| commit | 3c5d1c72471f71484d25002b85061fe7fa543116 (patch) | |
| tree | e3ba7367bd08731cbbf10bd400c63b8c5f76aaac /gnuradio-core/src/lib | |
| parent | 34c7025bc12585b493b71297284f365054d29bd7 (diff) | |
| parent | 647e8263d9c03894d3986482af8cec6315c310c7 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/filter/gr_fir_sysconfig_x86.cc
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_block.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnuradio-core/src/lib/runtime/gr_block.cc b/gnuradio-core/src/lib/runtime/gr_block.cc index 7073895ce7..2ff9cfb750 100644 --- a/gnuradio-core/src/lib/runtime/gr_block.cc +++ b/gnuradio-core/src/lib/runtime/gr_block.cc @@ -82,10 +82,10 @@ gr_block::gr_block (const std::string &name, GR_LOG_SET_LEVEL(DLOG, debug_level); if(debug_file.size() > 0) { if(debug_file == "stdout") { - GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "gr::log :%p: %c{1} - %m%n", "System.out"); + GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "gr::debug :%p: %c{1} - %m%n", "System.out"); } else if(debug_file == "stderr") { - GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "gr::log :%p: %c{1} - %m%n", "System.err"); + GR_LOG_ADD_CONSOLE_APPENDER(DLOG, "gr::debug :%p: %c{1} - %m%n", "System.err"); } else { GR_LOG_ADD_FILE_APPENDER(DLOG, "%r :%p: %c{1} - %m%n", debug_file, ""); |