From f4500ccb63f9d7e35460d2699472e1cf498d8229 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 2 Jan 2013 09:32:12 -0800 Subject: blocks: fixed file_meta_sink/source_impl MSVC incompatibliity error --- gr-blocks/lib/file_meta_sink_impl.cc | 11 +++++++---- gr-blocks/lib/file_meta_source_impl.cc | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) (limited to 'gr-blocks') diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc index ad16e9fca..b707bfac4 100644 --- a/gr-blocks/lib/file_meta_sink_impl.cc +++ b/gr-blocks/lib/file_meta_sink_impl.cc @@ -26,14 +26,12 @@ #include "file_meta_sink_impl.h" #include +#include #include #include #include #include -#include - -namespace gr { - namespace blocks { +#include // win32 (mingw/msvc) specific #ifdef HAVE_IO_H @@ -52,6 +50,11 @@ namespace gr { #define OUR_O_LARGEFILE 0 #endif + +namespace gr { + namespace blocks { + + file_meta_sink::sptr file_meta_sink::make(size_t itemsize, const std::string &filename, double samp_rate, double relative_rate, diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc index fb39b205b..42fdabb54 100644 --- a/gr-blocks/lib/file_meta_source_impl.cc +++ b/gr-blocks/lib/file_meta_source_impl.cc @@ -26,14 +26,12 @@ #include "file_meta_source_impl.h" #include +#include #include #include #include #include -#include - -namespace gr { - namespace blocks { +#include // win32 (mingw/msvc) specific #ifdef HAVE_IO_H @@ -52,6 +50,11 @@ namespace gr { #define OUR_O_LARGEFILE 0 #endif + +namespace gr { + namespace blocks { + + file_meta_source::sptr file_meta_source::make(const std::string &filename, bool repeat, -- cgit