luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce the number of warnings by VS2010

Browse Source 
git-svn-id: https://google-glog.googlecode.com/svn/trunk@112 eb4d4688-79bd-11dd-afb4-1d65580434c0
This commit is contained in:
2012-06-13 07:25:19 +00:00
parent e7712bf068
commit 6d42536769
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/base/mutex.h
View File

@ -107,7 +107,9 @@
#if defined(NO_THREADS) #if defined(NO_THREADS)
typedef int MutexType; // to keep a lock-count typedef int MutexType; // to keep a lock-count
#elif defined(_WIN32) || defined(__CYGWIN32__) || defined(__CYGWIN64__) #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 # ifdef GMUTEX_TRYLOCK
// We need Windows NT or later for TryEnterCriticalSection(). If you // We need Windows NT or later for TryEnterCriticalSection(). If you
// don't need that functionality, you can remove these _WIN32_WINNT // don't need that functionality, you can remove these _WIN32_WINNT
@ -117,9 +119,13 @@
# endif # endif
# endif # endif
// To avoid macro definition of ERROR. // To avoid macro definition of ERROR.
# define NOGDI # ifndef NOGDI
# define NOGDI
# endif
// To avoid macro definition of min/max. // To avoid macro definition of min/max.
# define NOMINMAX # ifndef NOMINMAX
# define NOMINMAX
# endif
# include <windows.h> # include <windows.h>
typedef CRITICAL_SECTION MutexType; typedef CRITICAL_SECTION MutexType;
#elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK) #elif defined(HAVE_PTHREAD) && defined(HAVE_RWLOCK)

2
src/glog/logging.h.in
View File

@ -608,7 +608,7 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
#endif #endif
std::strstream ss; std::strstream ss;
ss << names << " (" << v1 << " vs. " << v2 << ")"; 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. // Helper functions for CHECK_OP macro.

2
src/windows/glog/logging.h
View File

@ -612,7 +612,7 @@ std::string* MakeCheckOpString(const t1& v1, const t2& v2, const char* names) {
#endif #endif
std::strstream ss; std::strstream ss;
ss << names << " (" << v1 << " vs. " << v2 << ")"; 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. // Helper functions for CHECK_OP macro.