[sldev] [PATCH] build fixes for gcc 4

[Rob Lanphier]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Olivier,

This is really, really cool.  And, I think we'd really love to
incorporate it.  However, before our engineers can even look at this,
we need to make sure a contribution agreement is in place.  See:
http://secondlife.com/developers/opensource/submitting

Sorry we've gotta be so particular about this.  We have to be pretty
thorough about this type of thing to be sure we don't run into
ownership problems down the road.

Thanks
Rob


On 1/8/07 5:56 PM, Olivier Blin wrote:
> Hello,
>
> Here are some patches I had to do while building the Second Life
> package for Mandriva. I guess they can be reused and applied as is
> on the sources.
>
>
> ----------------------------------------------------------------------
>
>
> --- linden/indra/llmedia/llmediaengine.h.extra    2007-01-07
> 23:50:14.000000000 +0100 +++ linden/indra/llmedia/llmediaengine.h
> 2007-01-08 19:39:33.000000000 +0100 @@ -101,10 +101,10 @@ static
> void process_parcel_media_update ( LLMessageSystem *msg, void ** );
>
>
> // proxy configuration -    void LLMediaEngine::setNetworkProxy ( BOOL
> enabledIn, const LLString& addressIn, +    void setNetworkProxy ( BOOL
> enabledIn, const LLString& addressIn, S32 portIn, S32 socksIn,
> const LLString& excludeIn );
>
> -    void LLMediaEngine::getNetworkProxy ( BOOL& enabledOut, LLString&
> addressOut, +    void getNetworkProxy ( BOOL& enabledOut, LLString&
> addressOut, S32& portOut, S32& socksOut, LLString& excludeOuy );
>
> private: --- linden/indra/llmessage/message.h.extra    2007-01-07
> 23:50:14.000000000 +0100 +++ linden/indra/llmessage/message.h
> 2007-01-08 19:29:58.000000000 +0100 @@ -750,7 +750,7 @@ static F32
> mTimeDecodesSpamThreshold;  // If mTimeDecodes is on, all this many
> seconds for each msg decode before spamming static BOOL
> mTimeDecodes;  // Measure time for all message decodes if TRUE;
>
> -    void LLMessageSystem::init(); // ctor shared initialisation. +
> void init(); // ctor shared initialisation. };
>
>
> --- linden/indra/llrender/llimagegl.h.extra    2007-01-07
> 23:50:15.000000000 +0100 +++ linden/indra/llrender/llimagegl.h
> 2007-01-08 19:29:58.000000000 +0100 @@ -169,7 +169,7 @@
>
> // STATICS public: -    static std::set<LLImageGL*>
> LLImageGL::sImageList; +    static std::set<LLImageGL*> sImageList;
> static S32 sCount;  static F32 sLastFrameTime; ---
> linden/indra/llui/llfloater.h.extra    2007-01-07 23:50:16.000000000
> +0100 +++ linden/indra/llui/llfloater.h    2007-01-08
> 20:32:12.000000000 +0100 @@ -307,8 +307,8 @@ void
> getMinimizePosition( S32 *left, S32 *bottom); void            restoreAll();
> // un-minimize all floaters typedef std::set<LLView*> skip_list_t;
> -    void LLFloaterView::pushVisibleAll(BOOL visible, const
> skip_list_t& skip_list = skip_list_t()); -    void
> LLFloaterView::popVisibleAll(const skip_list_t& skip_list =
> skip_list_t()); +    void pushVisibleAll(BOOL visible, const
> skip_list_t& skip_list = skip_list_t()); +    void popVisibleAll(const
> skip_list_t& skip_list = skip_list_t());
>
> void            setCycleMode(BOOL mode); BOOL           
getCycleMode(); ---
> linden/indra/llui/llmenugl.h.extra    2007-01-07 23:50:16.000000000
> +0100 +++ linden/indra/llui/llmenugl.h    2007-01-08
> 21:22:24.000000000 +0100 @@ -424,7 +424,7 @@ virtual void
> drawBackground(LLMenuItemGL* itemp, LLColor4& color); virtual void
> setVisible(BOOL visible);
>
> -    virtual BOOL LLMenuGL::handleAcceleratorKey(KEY key, MASK mask);
> +    virtual BOOL handleAcceleratorKey(KEY key, MASK mask);
>
> LLMenuGL* getChildMenuByName(const LLString& name, BOOL recurse)
> const;  --- linden/indra/newview/lljoystickbutton.h.extra
> 2007-01-07 23:50:22.000000000 +0100 +++
> linden/indra/newview/lljoystickbutton.h    2007-01-08
> 23:58:29.000000000 +0100 @@ -94,7 +94,7 @@
>
> virtual void    onHeldDown();
>
> -    static LLView* LLJoystickAgentTurn::fromXML(LLXMLNodePtr node,
> LLView *parent, LLUICtrlFactory *factory); +    static LLView*
> fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
> *factory);
>
> };
>
> @@ -115,7 +115,7 @@ virtual void    onHeldDown(); virtual void
> onMouseUp();
>
> -    static LLView* LLJoystickAgentSlide::fromXML(LLXMLNodePtr node,
> LLView *parent, LLUICtrlFactory *factory); +    static LLView*
> fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
> *factory); };
>
>
> --- linden/indra/newview/llwearable.h.extra    2007-01-07
> 23:50:22.000000000 +0100 +++ linden/indra/newview/llwearable.h
> 2007-01-08 23:58:53.000000000 +0100 @@ -131,8 +131,8 @@
> LLPtrSkipMap<S32, F32*>    mVisualParamMap;    // maps visual param id to
> weight LLPtrSkipMap<S32, LLUUID*>    mTEMap;                // maps TE
to Image ID
>
>
> -    static const char* LLWearable::sTypeName[ WT_COUNT ]; -    static
> const char* LLWearable::sTypeLabel[ WT_COUNT ]; +    static const
> char* sTypeName[ WT_COUNT ]; +    static const char* sTypeLabel[
> WT_COUNT ]; };
>
> #endif  // LL_LLWEARABLE_H ---
> linden/indra/newview/llnotify.h.extra    2007-01-07 23:50:21.000000000
> +0100 +++ linden/indra/newview/llnotify.h    2007-01-08
> 23:59:56.000000000 +0100 @@ -61,7 +61,7 @@ /*virtual*/ void
> setVisible(BOOL visible);
>
> protected: -    LLNotifyBox::LLNotifyBox(const LLString& xml_desc,
> const LLString::format_map_t& args, +    LLNotifyBox(const LLString&
> xml_desc, const LLString::format_map_t& args, notify_callback_t
> callback, void* user_data, const option_list_t& extra_options =
> option_list_t(), BOOL layout_script_dialog = FALSE); ---
> linden/indra/newview/llfloatercustomize.h.extra    2007-01-07
> 23:50:23.000000000 +0100 +++
> linden/indra/newview/llfloatercustomize.h    2007-01-08
> 23:59:30.000000000 +0100 @@ -136,7 +136,7 @@
>
> protected:  -    static void*
> LLFloaterCustomize::createWearablePanel(void* userdata); +    static
> void* createWearablePanel(void* userdata);  void
> initWearablePanels(); void            initScrollingPanelList(); ---
> linden/indra/newview/lldynamictexture.h.extra    2007-01-07
> 23:50:21.000000000 +0100 +++
> linden/indra/newview/lldynamictexture.h    2007-01-09
> 00:18:51.000000000 +0100 @@ -79,7 +79,7 @@ LLCoordGL mOrigin;
>
> LLCamera mCamera; -    static LLLinkedList<LLDynamicTexture>
> LLDynamicTexture::sInstances[ LLDynamicTexture::ORDER_COUNT ]; +
> static LLLinkedList<LLDynamicTexture> sInstances[
> LLDynamicTexture::ORDER_COUNT ]; static S32 sNumRenders; };
>
> --- linden/indra/newview/llpanelinventory.h.extra    2007-01-07
> 23:50:22.000000000 +0100 +++
> linden/indra/newview/llpanelinventory.h    2007-01-09
> 00:35:21.000000000 +0100 @@ -77,7 +77,7 @@ InventoryObjectList*
> inventory, S32 serial_num, void* user_data); -    void
> LLPanelInventory::updateInventory(); +    void updateInventory(); void
> createFolderViews(LLInventoryObject* inventory_root,
> InventoryObjectList& contents); void
> createViewsForCategory(InventoryObjectList* inventory,
> LLInventoryObject* parent, ---
> linden/indra/newview/llpanelcontents.h.extra    2007-01-07
> 23:50:23.000000000 +0100 +++ linden/indra/newview/llpanelcontents.h
> 2007-01-09 00:37:59.000000000 +0100 @@ -40,7 +40,7 @@ class
> LLPanelContents : public LLPanel { public: -    virtual    BOOL
> LLPanelContents::postBuild(); +    virtual    BOOL postBuild();
> LLPanelContents(const std::string& name); virtual
> ~LLPanelContents();
>
> --- linden/indra/newview/llviewertexteditor.cpp.extra    2007-01-07
> 23:50:24.000000000 +0100 +++
> linden/indra/newview/llviewertexteditor.cpp    2007-01-09
> 00:54:37.000000000 +0100 @@ -405,7 +405,7 @@ class
> LLTextCmdInsertEmbeddedItem : public LLTextCmd { public: -
> LLTextCmdInsertEmbeddedItem::LLTextCmdInsertEmbeddedItem( S32 pos,
> LLInventoryItem* item ) +    LLTextCmdInsertEmbeddedItem( S32 pos,
> LLInventoryItem* item ) : LLTextCmd(pos, FALSE), mExtCharValue(0) {
>
>
> ----------------------------------------------------------------------
>
>
> --- linden/indra/llui/llviewborder.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/llviewborder.h
> 2007-01-08 21:17:08.000000000 +0100 @@ -36,6 +36,7 @@ #include
> "llimagegl.h" #include "llxmlnode.h"
>
> +class LLUICtrlFactory; class LLUUID;
>
>
> --- linden/indra/llui/llbutton.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/llbutton.h
> 2007-01-08 21:21:27.000000000 +0100 @@ -37,6 +37,8 @@ #include
> "llimage.h" #include "lluistring.h"
>
> +class LLUICtrlFactory; + // // Constants // ---
> linden/indra/llui/lltextbox.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/lltextbox.h
> 2007-01-08 21:41:20.000000000 +0100 @@ -35,6 +35,8 @@ #include
> "lluistring.h"
>
>
> +class LLUICtrlFactory; + class LLTextBox :    public LLUICtrl { ---
> linden/indra/llui/lliconctrl.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/lliconctrl.h
> 2007-01-08 21:27:53.000000000 +0100 @@ -34,6 +34,7 @@ #include
> "stdenums.h" #include "llimagegl.h"
>
> +class LLUICtrlFactory; class LLTextBox;
>
> // --- linden/indra/llui/lltexteditor.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/lltexteditor.h
> 2007-01-08 21:29:22.000000000 +0100 @@ -39,6 +39,7 @@ #include
> "lleditmenuhandler.h" #include "lldarray.h"
>
> +class LLUICtrlFactory; class LLFontGL; class LLScrollbar; class
> LLViewBorder; ---
> linden/indra/llui/llscrollcontainer.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/llscrollcontainer.h
> 2007-01-08 21:30:40.000000000 +0100 @@ -46,6 +46,7 @@ // This class
> is a decorator class.
> //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
>
> +class LLUICtrlFactory; class LLScrollbar; class LLViewBorder;
>
> --- linden/indra/llui/llslider.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/llslider.h
> 2007-01-08 21:31:48.000000000 +0100 @@ -31,6 +31,8 @@ #include
> "lluictrl.h" #include "v4color.h"
>
> +class LLUICtrlFactory; + class LLSlider : public LLUICtrl {
> public: --- linden/indra/llui/llspinctrl.h.uictrlfactory    2007-01-07
> 23:50:16.000000000 +0100 +++ linden/indra/llui/llspinctrl.h
> 2007-01-08 21:37:36.000000000 +0100 @@ -46,6 +46,7 @@ // // Classes
>  // +class LLUICtrlFactory; class LLFontGL; class LLButton; class
> LLTextBox;
>
> ----------------------------------------------------------------------
>
>
> --- linden/indra/newview/llviewertexteditor.h.llembeddeditems
> 2007-01-07 23:50:21.000000000 +0100 +++
> linden/indra/newview/llviewertexteditor.h    2007-01-09
> 00:28:11.000000000 +0100 @@ -31,6 +31,7 @@ #include
> "lltexteditor.h"
>
> class LLInventoryItem; +class LLEmbeddedItems;
>
>
> //
>
> ----------------------------------------------------------------------
>
>
>
> The Mandriva package contains some others patches that are not as
> reusable (yacc issues fixes, ELFIO lib naming, fmod disabling,
> boost lib naming). The patches and spec file are available on our
> SVN server:
> http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/secondlife/current/
>
>
> I hope this helps.
>
> Thanks for releasing this huge piece of work!
>
>
> ----------------------------------------------------------------------
>
>
> _______________________________________________ Click here to
> unsubscribe or manage your list subscription:
> /index.html

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFo/GsPd430ImZiAMRAnEKAJ9il1VgA8gQV8RYOGdPwYRHAxrtJgCffZDT
MdsTOUXSgg07TlH0ySHXddg=
=d43Y
-----END PGP SIGNATURE-----