Commit 841ad803 authored by Davis King's avatar Davis King

merged

parents 5e75471a 48556667
...@@ -12,6 +12,14 @@ ...@@ -12,6 +12,14 @@
#include <cstdio> #include <cstdio>
#include "../algs.h" #include "../algs.h"
#ifdef _MSC_VER
// Disable the warning about inheriting from std::iostream 'via dominance' since this warning is a warning about
// visual studio conforming to the standard and is ignorable. See http://connect.microsoft.com/VisualStudio/feedback/details/733720/inheriting-from-std-fstream-produces-c4250-warning
// for further details if interested.
#pragma warning(disable : 4250)
#endif // _MSC_VER
namespace dlib namespace dlib
{ {
class vectorstream : public std::iostream class vectorstream : public std::iostream
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment