Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv1296
Modified Files:
Tag: simdata
TypeAdapter.h
Log Message:
no message
Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/TypeAdapter.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** TypeAdapter.h 19 Jan 2003 20:28:30 -0000 1.1.2.1
--- TypeAdapter.h 20 Jan 2003 18:26:06 -0000 1.1.2.2
***************
*** 28,31 ****
--- 28,35 ----
#define __TYPEADAPTER_H__
+ #if defined(_MSC_VER) && (_MSC_VER <= 1200)
+ #pragma warning (disable : 4290 4786)
+ #endif
+
#include <string>
#include <iostream>
***************
*** 110,114 ****
operator double const() const { DoubleCheck(); return var.d; }
! operator float const() const { DoubleCheck(); return var.d; }
operator std::string const() const { StringCheck(); return s; }
--- 114,118 ----
operator double const() const { DoubleCheck(); return var.d; }
! operator float const() const { DoubleCheck(); return static_cast<float>(var.d); }
operator std::string const() const { StringCheck(); return s; }
|