mirrors
/
flac
mirror of https://github.com/xiph/flac
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pragma warning. 

Patch-from: lvqcl <lvqcl.mail@gmail.com>
This commit is contained in:
Erik de Castro Lopo 2014-03-14 15:15:48 +11:00
parent 7cbecbae9f
commit f5902a474c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/FLAC++/metadata.h
View File

@ -241,8 +241,7 @@ namespace FLAC {
{ return (bool)::FLAC__metadata_object_is_equal(object_, object); } { return (bool)::FLAC__metadata_object_is_equal(object_, object); }
#ifdef _MSC_VER #ifdef _MSC_VER
// @@@ how to re-enable? the following doesn't work #pragma warning ( default : 4800 )
// #pragma warning ( enable : 4800 )
#endif #endif
inline bool Prototype::operator!=(const Prototype &object) const inline bool Prototype::operator!=(const Prototype &object) const

5
src/test_libFLAC++/encoders.cpp
View File

@ -35,6 +35,11 @@ extern "C" {
#include <string.h> #include <string.h>
#include "share/compat.h" #include "share/compat.h"
#ifdef _MSC_VER
// warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
#pragma warning ( disable : 4800 )
#endif
typedef enum { typedef enum {
LAYER_STREAM = 0, /* FLAC__stream_encoder_init_stream() without seeking */ LAYER_STREAM = 0, /* FLAC__stream_encoder_init_stream() without seeking */
LAYER_SEEKABLE_STREAM, /* FLAC__stream_encoder_init_stream() with seeking */ LAYER_SEEKABLE_STREAM, /* FLAC__stream_encoder_init_stream() with seeking */