Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5428/src/libopenvrml/openvrml
Modified Files:
Tag: OpenVRML-0_16-BRANCH
vrml97node.cpp
Log Message:
Ensure char32_t is 4 bytes even if wchar_t is not.
Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.108.2.14
retrieving revision 1.108.2.15
diff -C2 -d -r1.108.2.14 -r1.108.2.15
*** vrml97node.cpp 16 Apr 2007 02:00:46 -0000 1.108.2.14
--- vrml97node.cpp 28 Apr 2007 06:58:43 -0000 1.108.2.15
***************
*** 3793,3801 ****
# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
! # ifdef _WIN32
! typedef __int32 char32_t;
! # else
! typedef wchar_t char32_t;
! # endif
# endif
--- 3793,3800 ----
# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
! typedef boost::mpl::if_c<sizeof (wchar_t) == 4,
! wchar_t,
! openvrml::int32>::type
! char32_t;
# endif
|
