diff --git a/include/osg/Billboard b/include/osg/Billboard index 551ac011e..e8acecb19 100644 --- a/include/osg/Billboard +++ b/include/osg/Billboard @@ -90,7 +90,7 @@ class SG_EXPORT Billboard : public Geode { AXIAL_ROT_X_AXIS=AXIAL_ROT+1, AXIAL_ROT_Y_AXIS, - AXIAL_ROT_Z_AXIS, + AXIAL_ROT_Z_AXIS }; diff --git a/src/osg/Notify.cpp b/src/osg/Notify.cpp index e66491058..75f2bcfa0 100644 --- a/src/osg/Notify.cpp +++ b/src/osg/Notify.cpp @@ -1,6 +1,10 @@ #include #include +#if defined(__BCPLUSPLUS__) +using std::toupper; +#endif + osg::NotifySeverity osg::g_NotifyLevel = osg::NOTICE; std::ofstream *osg::g_NotifyNulStream; bool osg::g_NotifyInit = false;