organicmaps/gflags
13
Fork 0
mirror of https://github.com/gflags/gflags.git synced 2025-04-05 05:25:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge pull request #129 from Nazg-Gul/master

Browse source 
Resolve some compiler warnings
This commit is contained in:
Andreas Schuh 2016-01-12 13:30:13 +00:00
commit 03bebcb065
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gflags_completions.cc
View file

@ -47,6 +47,8 @@
// 5b) Trim most flag's descriptions to fit on a single terminal line
#include "gflags_completions.h"
#include "config.h"
#include <stdio.h>

6
src/windows_port.cc
View file

@ -44,6 +44,7 @@
// These call the windows _vsnprintf, but always NUL-terminate.
#if !defined(__MINGW32__) && !defined(__MINGW64__) /* mingw already defines */
#if !(defined(_MSC_VER) && _MSC_VER >= 1900) /* msvc 2015 already defines */
#ifdef _MSC_VER
# pragma warning(push)
@ -59,8 +60,6 @@ int safe_vsnprintf(char *str, size_t size, const char *format, va_list ap) {
# pragma warning(pop)
#endif
#if _MSC_VER < 1900 // msvs 2015 finally includes snprintf
int snprintf(char *str, size_t size, const char *format, ...) {
int r;
va_list ap;
@ -70,6 +69,5 @@ int snprintf(char *str, size_t size, const char *format, ...) {
return r;
}
#endif
#endif /* if !(defined(_MSC_VER) && _MSC_VER >= 1900) */
#endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */

2
src/windows_port.h
View file

@ -63,12 +63,14 @@
* name vsnprintf, since windows defines that (but not snprintf (!)).
*/
#if !defined(__MINGW32__) && !defined(__MINGW64__) /* mingw already defines */
#if !(defined(_MSC_VER) && _MSC_VER >= 1900) /* msvc 2015 already defines */
extern GFLAGS_DLL_DECL int snprintf(char *str, size_t size,
const char *format, ...);
extern int GFLAGS_DLL_DECL safe_vsnprintf(char *str, size_t size,
const char *format, va_list ap);
#define vsnprintf(str, size, format, ap) safe_vsnprintf(str, size, format, ap)
#define va_copy(dst, src) (dst) = (src)
#endif
#endif /* #if !defined(__MINGW32__) && !defined(__MINGW64__) */
#ifdef _MSC_VER

1
test/gflags_declare_flags.cc
View file

@ -3,6 +3,7 @@
DECLARE_string(message); // in gflags_delcare_test.cc
void print_message();
void print_message()
{
std::cout << FLAGS_message << std::endl;

2
test/gflags_unittest.cc
View file

@ -1485,7 +1485,7 @@ TEST(FlagsValidator, FlagSaver) {
} // unnamed namespace
int main(int argc, char **argv) {
static int main(int argc, char **argv) {
// Run unit tests only if called without arguments, otherwise this program
// is used by an "external" usage test