Merge branch 'master' into usrp2p

this was the merge from hell

Conflicts:

	firmware/microblaze/Makefile.am
	firmware/microblaze/bootstrap
	firmware/microblaze/configure.ac
	firmware/microblaze/lib/Makefile.inc
	host/lib/CMakeLists.txt
	host/lib/usrp/mimo_usrp.cpp
	host/lib/usrp/simple_usrp.cpp
	host/lib/usrp/usrp2/clock_ctrl.cpp
	host/lib/usrp/usrp2/codec_impl.cpp
	host/lib/usrp/usrp2/dboard_impl.cpp
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_iface.hpp
	host/lib/usrp/usrp2/usrp2_impl.hpp
	host/lib/usrp/usrp2/usrp2_regs.hpp
	host/test/CMakeLists.txt

1 files changed, 36 insertions, 0 deletions

diff --git a/host/lib/utils/warning.cpp b/host/lib/utils/warning.cpp
new file mode 100644
index 000000000..ae4d4c7aa
--- /dev/null
+++ b/host/lib/utils/warning.cpp
@@ -0,0 +1,36 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program 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 of the License, or
+// (at your option) any later version.
+//
+// This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/warning.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
+#include <vector>
+
+using namespace uhd;
+
+void uhd::print_warning(const std::string &msg){
+    //extract the message lines
+    std::vector<std::string> lines;
+    boost::split(lines, msg, boost::is_any_of("\n"));
+
+    //print the warning message
+    std::cerr << std::endl << "Warning:" << std::endl;
+    BOOST_FOREACH(const std::string &line, lines){
+        std::cerr << "    " << line << std::endl;
+    }
+}