From: <mk...@us...> - 2003-01-20 04:37:01
|
Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData In directory sc8-pr-cvs1:/tmp/cvs-serv13051/Include/SimData Modified Files: Tag: simdata GlibCsp.h Math.h hash_map.h Log Message: M_PI defined now as G_PI, fixed hash_map path again for win32 Index: GlibCsp.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/GlibCsp.h,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** GlibCsp.h 20 Jan 2003 04:29:38 -0000 1.1.2.3 --- GlibCsp.h 20 Jan 2003 04:36:58 -0000 1.1.2.4 *************** *** 37,40 **** --- 37,41 ---- #define __GLIB_CSP_H__ + #define G_PI 3.14159265358979323846 /* pi */ // this needs to be generated by the configure script: Index: Math.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/Math.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 *** Math.h 19 Jan 2003 20:28:30 -0000 1.1.2.1 --- Math.h 20 Jan 2003 04:36:58 -0000 1.1.2.2 *************** *** 25,28 **** --- 25,29 ---- #include <cmath> #include <SimData/ns-simdata.h> + #include <SimData/GlibCsp.h> *************** *** 34,43 **** inline double DegreesToRadians(double deg) { ! return deg * M_PI / 180.0f; } inline double RadiansToDegrees(double rad) { ! return rad * 180.0f / M_PI; } --- 35,44 ---- inline double DegreesToRadians(double deg) { ! return deg * G_PI / 180.0f; } inline double RadiansToDegrees(double rad) { ! return rad * 180.0f / G_PI; } Index: hash_map.h =================================================================== RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/hash_map.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 *** hash_map.h 20 Jan 2003 04:14:42 -0000 1.1.2.1 --- hash_map.h 20 Jan 2003 04:36:58 -0000 1.1.2.2 *************** *** 7,11 **** #else #ifdef WIN32 ! #include <backward/hash_map.h> #else #error "PLEASE PROVIDE CORRECT #INCLUDE<HASH_MAP> STATEMENT FOR YOUR PLATFORM!" --- 7,11 ---- #else #ifdef WIN32 ! #include <hash_map.h> #else #error "PLEASE PROVIDE CORRECT #INCLUDE<HASH_MAP> STATEMENT FOR YOUR PLATFORM!" |