livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes for GCC >= 4.6.

Nicky 2011-10-30 17:48:58 +01:00
parent 7a998b8c07
commit f88181b4af
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llkeywords.h
View File

@ -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 // <ND/> That typedef makes GCC >= 4.6 really angry, rightfully so.
{
WORD,
LINE,

3
indra/newview/llgrouplist.cpp
View File

@ -66,7 +66,8 @@ public:
}
};
static const LLGroupComparator GROUP_COMPARATOR;
//static const LLGroupComparator GROUP_COMPARATOR;
static LLGroupComparator GROUP_COMPARATOR; // <ND/> const makes GCC >= 4.6 very angry about not user defined default ctor.
LLGroupList::Params::Params()
: for_agent("for_agent", true)

9
indra/newview/llinventorypanel.cpp
View File

@ -52,7 +52,8 @@ static LLDefaultChildRegistry::Register<LLInventoryPanel> 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; // <ND/> 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<LLInventoryRecentItemsPanel> t_recent_inventory_panel("recent_inventory_panel");
static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER;
//static const LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER;
static LLRecentInventoryBridgeBuilder RECENT_ITEMS_BUILDER; // <ND/> 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<LLInventoryWornItemsPanel> t_worn_inventory_panel("worn_inventory_panel");
static const LLWornInventoryBridgeBuilder WORN_ITEMS_BUILDER;
//static const LLWornInventoryBridgeBuilder WORN_ITEMS_BUILDER;
static LLWornInventoryBridgeBuilder WORN_ITEMS_BUILDER; // <ND/> const makes GCC >= 4.6 very angry about not user defined default ctor.
class LLInventoryWornItemsPanel : public LLInventoryPanel
{
public:

3
indra/newview/llplacesinventorypanel.cpp
View File

@ -39,7 +39,8 @@
static LLDefaultChildRegistry::Register<LLPlacesInventoryPanel> r("places_inventory_panel");
static const LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER;
//static const LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER;
static LLPlacesInventoryBridgeBuilder PLACES_INVENTORY_BUILDER; // <ND/> const makes GCC >= 4.6 very angry about not user defined default ctor.
LLPlacesInventoryPanel::LLPlacesInventoryPanel(const Params& p) :
LLInventoryPanel(p),

3
indra/newview/llwearableitemslist.cpp
View File

@ -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; // <ND/> const makes GCC >= 4.6 very angry about not user defined default ctor.
static const LLDefaultChildRegistry::Register<LLWearableItemsList> r("wearable_items_list");