Reduce the number of warnings by VS2010

git-svn-id: https://google-glog.googlecode.com/svn/trunk@112 eb4d4688-79bd-11dd-afb4-1d65580434c0

diff --git a/src/base/mutex.h b/src/base/mutex.h
index 7ba88cb..37527d5 100644 (file)
--- a/src/base/mutex.h
+++ b/src/base/mutex.h
@@ -107,7 +107,9 @@
 #if defined(NO_THREADS)
   typedef int MutexType;      // to keep a lock-count
 #elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__)
-# define WIN32_LEAN_AND_MEAN  // We only need minimal includes
+# ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN  // We only need minimal includes
+# endif
 # ifdef GMUTEX_TRYLOCK
   // We need Windows NT or later for TryEnterCriticalSection().  If you
   // don't need that functionality, you can remove these _WIN32_WINNT
@@ -117,9 +119,13 @@
 #   endif
 # endif
 // To avoid macro definition of ERROR.
-# define NOGDI
+# ifndef NOGDI
+#  define NOGDI
+# endif
 // To avoid macro definition of min/max.
-# define NOMINMAX
+# ifndef NOMINMAX
+#  define NOMINMAX
+# endif
 # include <windows.h>
   typedef CRITICAL_SECTION MutexType;
 #elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK)

diff --git a/src/glog/logging.h.in b/src/glog/logging.h.in
index d9aca8a..71859a9 100644 (file)
--- a/src/glog/logging.h.in
+++ b/src/glog/logging.h.in
@@ -608,7 +608,7 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
 #endif
   std::strstream ss;
   ss << names << " (" << v1 << " vs. " << v2 << ")";
-  return new std::string(ss.str(), ss.pcount());
+  return new std::string(ss.str(), static_cast<unsigned int>(ss.pcount()));
 }
 
 // Helper functions for CHECK_OP macro.

diff --git a/src/windows/glog/logging.h b/src/windows/glog/logging.h
index f854a06..76c38cd 100755 (executable)
--- a/src/windows/glog/logging.h
+++ b/src/windows/glog/logging.h
@@ -612,7 +612,7 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
 #endif
   std::strstream ss;
   ss << names << " (" << v1 << " vs. " << v2 << ")";
-  return new std::string(ss.str(), ss.pcount());
+  return new std::string(ss.str(), static_cast<unsigned int>(ss.pcount()));
 }
 
 // Helper functions for CHECK_OP macro.