=== modified file 'macros/libltdl.m4' --- macros/libltdl.m4 2010-01-01 17:48:26 +0000 +++ macros/libltdl.m4 2010-01-08 15:08:04 +0000 @@ -3894,10 +3894,22 @@ solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + fi ;; esac ;; === modified file 'libcore/DisplayObject.cpp' --- libcore/DisplayObject.cpp 2010-01-01 17:48:26 +0000 +++ libcore/DisplayObject.cpp 2010-01-07 21:33:25 +0000 @@ -1548,29 +1548,29 @@ displayObjectGetters() { static const Getters getters = boost::assign::map_list_of - (NSV::PROP_uX, getX) - (NSV::PROP_uY, getY) - (NSV::PROP_uXSCALE, getScaleX) - (NSV::PROP_uYSCALE, getScaleY) - (NSV::PROP_uROTATION, getRotation) - (NSV::PROP_uHIGHQUALITY, getHighQuality) - (NSV::PROP_uQUALITY, getQuality) - (NSV::PROP_uALPHA, getAlpha) - (NSV::PROP_uWIDTH, getWidth) - (NSV::PROP_uURL, getURL) - (NSV::PROP_uHEIGHT, getHeight) - (NSV::PROP_uNAME, getNameProperty) - (NSV::PROP_uVISIBLE, getVisible) - (NSV::PROP_uSOUNDBUFTIME, getSoundBufTime) - (NSV::PROP_uFOCUSRECT, getFocusRect) - (NSV::PROP_uDROPTARGET, getDropTarget) - (NSV::PROP_uCURRENTFRAME, getCurrentFrame) - (NSV::PROP_uFRAMESLOADED, getFramesLoaded) - (NSV::PROP_uTOTALFRAMES, getTotalFrames) - (NSV::PROP_uPARENT, getParent) - (NSV::PROP_uTARGET, getTarget) - (NSV::PROP_uXMOUSE, getMouseX) - (NSV::PROP_uYMOUSE, getMouseY); + (NSV::PROP_uX, static_cast(getX)) + (NSV::PROP_uY, static_cast(getY)) + (NSV::PROP_uXSCALE, static_cast(getScaleX)) + (NSV::PROP_uYSCALE, static_cast(getScaleY)) + (NSV::PROP_uROTATION, static_cast(getRotation)) + (NSV::PROP_uHIGHQUALITY, static_cast(getHighQuality)) + (NSV::PROP_uQUALITY, static_cast(getQuality)) + (NSV::PROP_uALPHA, static_cast(getAlpha)) + (NSV::PROP_uWIDTH, static_cast(getWidth)) + (NSV::PROP_uURL, static_cast(getURL)) + (NSV::PROP_uHEIGHT, static_cast(getHeight)) + (NSV::PROP_uNAME, static_cast(getNameProperty)) + (NSV::PROP_uVISIBLE, static_cast(getVisible)) + (NSV::PROP_uSOUNDBUFTIME, static_cast(getSoundBufTime)) + (NSV::PROP_uFOCUSRECT, static_cast(getFocusRect)) + (NSV::PROP_uDROPTARGET, static_cast(getDropTarget)) + (NSV::PROP_uCURRENTFRAME, static_cast(getCurrentFrame)) + (NSV::PROP_uFRAMESLOADED, static_cast(getFramesLoaded)) + (NSV::PROP_uTOTALFRAMES, static_cast(getTotalFrames)) + (NSV::PROP_uPARENT, static_cast(getParent)) + (NSV::PROP_uTARGET, static_cast(getTarget)) + (NSV::PROP_uXMOUSE, static_cast(getMouseX)) + (NSV::PROP_uYMOUSE, static_cast(getMouseY)); return getters; } @@ -1580,20 +1580,20 @@ const Setter n = 0; static const Setters setters = boost::assign::map_list_of - (NSV::PROP_uX, setX) - (NSV::PROP_uY, setY) - (NSV::PROP_uXSCALE, setScaleX) - (NSV::PROP_uYSCALE, setScaleY) - (NSV::PROP_uROTATION, setRotation) - (NSV::PROP_uHIGHQUALITY, setHighQuality) - (NSV::PROP_uQUALITY, setQuality) - (NSV::PROP_uALPHA, setAlpha) - (NSV::PROP_uWIDTH, setWidth) - (NSV::PROP_uHEIGHT, setHeight) - (NSV::PROP_uNAME, setName) - (NSV::PROP_uVISIBLE, setVisible) - (NSV::PROP_uSOUNDBUFTIME, setSoundBufTime) - (NSV::PROP_uFOCUSRECT, setFocusRect) + (NSV::PROP_uX, static_cast(setX)) + (NSV::PROP_uY, static_cast(setY)) + (NSV::PROP_uXSCALE, static_cast(setScaleX)) + (NSV::PROP_uYSCALE, static_cast(setScaleY)) + (NSV::PROP_uROTATION, static_cast(setRotation)) + (NSV::PROP_uHIGHQUALITY, static_cast(setHighQuality)) + (NSV::PROP_uQUALITY, static_cast(setQuality)) + (NSV::PROP_uALPHA, static_cast(setAlpha)) + (NSV::PROP_uWIDTH, static_cast(setWidth)) + (NSV::PROP_uHEIGHT, static_cast(setHeight)) + (NSV::PROP_uNAME, static_cast(setName)) + (NSV::PROP_uVISIBLE, static_cast(setVisible)) + (NSV::PROP_uSOUNDBUFTIME, static_cast(setSoundBufTime)) + (NSV::PROP_uFOCUSRECT, static_cast(setFocusRect)) (NSV::PROP_uDROPTARGET, n) (NSV::PROP_uCURRENTFRAME, n) (NSV::PROP_uFRAMESLOADED, n) === modified file 'libcore/MovieLoader.cpp' --- libcore/MovieLoader.cpp 2009-11-22 09:41:56 +0000 +++ libcore/MovieLoader.cpp 2010-01-08 00:39:55 +0000 @@ -425,11 +425,10 @@ /// If the method is MovieClip::METHOD_NONE, we send no data. if (method == MovieClip::METHOD_GET) { - std::string varsToSend(urlstr); /// GET: append data to query string. std::string qs = url.querystring(); - if ( qs.empty() ) varsToSend.insert(0, 1, '?'); - else varsToSend.insert(0, 1, '&'); + std::string varsToSend(qs.empty() ? "?" : "&"); + varsToSend.append(urlstr); url.set_querystring(qs + varsToSend); } === modified file 'libcore/asobj/LoadableObject.cpp' --- libcore/asobj/LoadableObject.cpp 2010-01-01 17:48:26 +0000 +++ libcore/asobj/LoadableObject.cpp 2010-01-08 03:52:03 +0000 @@ -50,7 +50,7 @@ } void -attachLoadableInterface(as_object& o, const int flags) +attachLoadableInterface(as_object& o, int flags) { Global_as& gl = getGlobal(o); === modified file 'utilities/dumpshm.cpp' --- utilities/dumpshm.cpp 2010-01-01 17:48:26 +0000 +++ utilities/dumpshm.cpp 2010-01-08 04:21:02 +0000 @@ -240,7 +240,7 @@ return; } if (dbglogfile.getVerbosity()) { - log_debug(_("Existing SHM Key is: 0x %s %s, Size is: %s %s"), hex, key, dec, size); + log_debug(_("Existing SHM Key is: %s, Size is: %s"), boost::io::group(hex, showbase, key), size); } amf::LcShm lc; @@ -314,7 +314,7 @@ } #ifdef IPC_PERM_KEY if (shmseg.shm_segsz == 64528) { - log_debug(_("Found it! \"set LCShmKey 0x %s %s \" in your ~/.gnashrc", hex, shmseg.shm_perm.IPC_PERM_KEY)); + log_debug(_("Found it! \"set LCShmKey %s\" in your ~/.gnashrc", boost::io::group(hex, showbase, shmseg.shm_perm.IPC_PERM_KEY))); log_debug(_("Last changed on: %s", ctime(&shmseg.shm_ctime))); log_debug(_("Last attached on: %s", ctime(&shmseg.shm_atime))); log_debug(_("Last detached on: %s", ctime(&shmseg.shm_dtime)));