Add <algorithm> includes and use min/max to get them into global scope

2014-10-31 23:34:01 +01:00 · 2014-10-31 23:34:01 +01:00 · d2039386b0
parent be1d411b83
commit d2039386b0
2 changed files with 5 additions and 0 deletions
--- a/depends/md5/md5wrapper.cpp
+++ b/depends/md5/md5wrapper.cpp
@ -22,6 +22,7 @@

 //----------------------------------------------------------------------
 //basic includes
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <errno.h>
--- a/depends/protobuf/google/protobuf/stubs/common.h
+++ b/depends/protobuf/google/protobuf/stubs/common.h
@ -47,6 +47,10 @@
 #elif !defined(_MSC_VER)
 #include <stdint.h>
 #endif
+#include <algorithm>
+
+using std::min;
+using std::max;

 // make MSVC shut up about some things
 #ifdef _MSC_VER