[Scummvm-cvs-logs] CVS: scummvm/common stdafx.h,1.11,1.12 str.cpp,1.18,1.19
Travis Howell
kirben at users.sourceforge.net
Thu Jul 31 22:42:34 CEST 2003
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv1597/common
Modified Files:
stdafx.h str.cpp
Log Message:
This should be Microsoft Visual C++ only
Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stdafx.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- stdafx.h 31 Jul 2003 18:35:00 -0000 1.11
+++ stdafx.h 1 Aug 2003 05:41:07 -0000 1.12
@@ -35,10 +35,12 @@
#elif defined(WIN32)
+#if _MSC_VER
#pragma once
#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
#pragma warning( disable : 4244 ) // turn off "conversion type" warning
#pragma warning( disable : 4390 ) // turn oof "empty statement" warning for BS2 code
+#endif
#if !defined(_WIN32_WCE)
Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- str.cpp 31 Jul 2003 06:45:56 -0000 1.18
+++ str.cpp 1 Aug 2003 05:41:07 -0000 1.19
@@ -23,11 +23,6 @@
#include <ctype.h>
-#ifdef _MSC_VER
-// Disable "unknown pragma" warning in MSVC 6
-#pragma warning(disable : 4068)
-#endif
-
namespace ScummVM {
String::String(const char *str, int len) {
More information about the Scummvm-git-logs
mailing list