diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 16:08:08 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-05 16:08:08 -0500 |
| commit | e2452caaf2e7f5fb640cda92b87f49f8f4d18c86 (patch) | |
| tree | 417ce934b251ad7a9a86b1725b865ce82f4641ec /gr-blocks/lib/tcp_connection.h | |
| parent | b279da79d17ab8cd1bb011c5e6c0305c2a506462 (diff) | |
| parent | bf343e58bc5b4ef026bb4c8722312a6f123becf2 (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/gr_prefs.cc
Diffstat (limited to 'gr-blocks/lib/tcp_connection.h')
| -rw-r--r-- | gr-blocks/lib/tcp_connection.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-blocks/lib/tcp_connection.h b/gr-blocks/lib/tcp_connection.h index 94755e847a..ba57de0783 100644 --- a/gr-blocks/lib/tcp_connection.h +++ b/gr-blocks/lib/tcp_connection.h @@ -23,6 +23,7 @@ #ifndef INCLUDED_TCP_CONNECTION_H #define INCLUDED_TCP_CONNECTION_H +#include <boost/array.hpp> #include <boost/asio.hpp> #include <gruel/pmt.h> |