From f88181b4afd15a9e275dd3ec278caab14194f045 Mon Sep 17 00:00:00 2001 From: Nicky Date: Sun, 30 Oct 2011 17:48:58 +0100 Subject: [PATCH] More fixes for GCC >= 4.6. --- indra/llui/llkeywords.h | 3 ++- indra/newview/llgrouplist.cpp | 3 ++- indra/newview/llinventorypanel.cpp | 9 ++++++--- indra/newview/llplacesinventorypanel.cpp | 3 ++- indra/newview/llwearableitemslist.cpp | 3 ++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/indra/llui/llkeywords.h b/indra/llui/llkeywords.h index d050cd7d7c..0376c7cd64 100644 --- a/indra/llui/llkeywords.h +++ b/indra/llui/llkeywords.h @@ -51,7 +51,8 @@ public: * - TWO_SIDED_DELIMITER are for delimiters that end with a different delimiter than they open with. * - DOUBLE_QUOTATION_MARKS are for delimiting areas using the same delimiter to open and close. */ - typedef enum TOKEN_TYPE + // typedef enum TOKEN_TYPE + enum TOKEN_TYPE // That typedef makes GCC >= 4.6 really angry, rightfully so. { WORD, LINE, diff --git a/indra/newview/llgrouplist.cpp b/indra/newview/llgrouplist.cpp index 83f7a2a913..6649307f83 100644 --- a/indra/newview/llgrouplist.cpp +++ b/indra/newview/llgrouplist.cpp @@ -66,7 +66,8 @@ public: } }; -static const LLGroupComparator GROUP_COMPARATOR; +//static const LLGroupComparator GROUP_COMPARATOR; +static LLGroupComparator GROUP_COMPARATOR; // const makes GCC >= 4.6 very angry about not user defined default ctor. LLGroupList::Params::Params() : for_agent("for_agent", true) diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index 4cbb2e55a6..3546a0f3e7 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -52,7 +52,8 @@ static LLDefaultChildRegistry::Register r("inventory_panel"); const std::string LLInventoryPanel::DEFAULT_SORT_ORDER = std::string("InventorySortOrder"); const std::string LLInventoryPanel::RECENTITEMS_SORT_ORDER = std::string("RecentItemsSortOrder"); const std::string LLInventoryPanel::INHERIT_SORT_ORDER = std::string(""); -static const LLInventoryFVBridgeBuilder INVENTORY_BRIDGE_BUILDER; +//static const LLInventoryFVBridgeBuilder INVENTORY_BRIDGE_BUILDER; +static LLInventoryFVBridgeBuilder INVENTORY_BRIDGE_BUILDER; // const makes GCC >= 4.6 very angry about not user defined default ctor. // [SL:KB] - Patch: Inventory-ActivePanel | Checked: 2011-06-29 (Catznip-2.6.0e) | Added: Catznip-2.6.0e bool LLInventoryPanel::s_fActiveSidebar = false; @@ -1238,7 +1239,8 @@ BOOL LLInventoryPanel::getIsHiddenFolderType(LLFolderType::EType folder_type) co class LLInventoryRecentItemsPanel; static LLDefaultChildRegistry::Register t_recent_inventory_panel("recent_inventory_panel"); -static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER; +//static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER; +static LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER; // const makes GCC >= 4.6 very angry about not user defined default ctor. class LLInventoryRecentItemsPanel : public LLInventoryPanel { public: @@ -1270,7 +1272,8 @@ LLInventoryRecentItemsPanel::LLInventoryRecentItemsPanel( const Params& params) class LLInventoryWornItemsPanel; static LLDefaultChildRegistry::Register t_worn_inventory_panel("worn_inventory_panel"); -static const LLWornInventoryBridgeBuilder WORN_ITEMS_BUILDER; +//static const LLWornInventoryBridgeBuilder WORN_ITEMS_BUILDER; +static LLWornInventoryBridgeBuilder WORN_ITEMS_BUILDER; // const makes GCC >= 4.6 very angry about not user defined default ctor. class LLInventoryWornItemsPanel : public LLInventoryPanel { public: diff --git a/indra/newview/llplacesinventorypanel.cpp b/indra/newview/llplacesinventorypanel.cpp index 0b6c57f1e7..15324880a2 100644 --- a/indra/newview/llplacesinventorypanel.cpp +++ b/indra/newview/llplacesinventorypanel.cpp @@ -39,7 +39,8 @@ static LLDefaultChildRegistry::Register r("places_inventory_panel"); -static const LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER; +//static const LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER; +static LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER; // const makes GCC >= 4.6 very angry about not user defined default ctor. LLPlacesInventoryPanel::LLPlacesInventoryPanel(const Params& p) : LLInventoryPanel(p), diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 2916d804bb..85379a8fcc 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -645,7 +645,8 @@ static void edit_item(const LLUUID& idItem) static LLWearableItemTypeNameComparator WEARABLE_TYPE_NAME_COMPARATOR; static const LLWearableItemTypeNameComparator WEARABLE_TYPE_LAYER_COMPARATOR; static const LLWearableItemNameComparator WEARABLE_NAME_COMPARATOR; -static const LLWearableItemCreationDateComparator WEARABLE_CREATION_DATE_COMPARATOR; +//static const LLWearableItemCreationDateComparator WEARABLE_CREATION_DATE_COMPARATOR; +static LLWearableItemCreationDateComparator WEARABLE_CREATION_DATE_COMPARATOR; // const makes GCC >= 4.6 very angry about not user defined default ctor. static const LLDefaultChildRegistry::Register r("wearable_items_list");