Skip to content
Snippets Groups Projects
Commit 9775b80f authored by Mark Palange (Mani)'s avatar Mark Palange (Mani)
Browse files

Code fixes for VS2010 compatibility

parent 60f83115
No related branches found
No related tags found
No related merge requests found
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include <boost/regex.hpp> #include <boost/regex.hpp>
#if LL_MSVC #if LL_MSVC
#pragma warning(push)
// disable boost::lexical_cast warning // disable boost::lexical_cast warning
#pragma warning (disable:4702) #pragma warning (disable:4702)
#endif #endif
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include <boost/regex/v4/match_results.hpp> #include <boost/regex/v4/match_results.hpp>
#if LL_MSVC #if LL_MSVC
#pragma warning(push)
// disable warning about boost::lexical_cast unreachable code // disable warning about boost::lexical_cast unreachable code
// when it fails to parse the string // when it fails to parse the string
#pragma warning (disable:4702) #pragma warning (disable:4702)
......
...@@ -1323,19 +1323,19 @@ void LLPanelOutfitEdit::getCurrentItemUUID(LLUUID& selected_id) ...@@ -1323,19 +1323,19 @@ void LLPanelOutfitEdit::getCurrentItemUUID(LLUUID& selected_id)
void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list) void LLPanelOutfitEdit::getSelectedItemsUUID(uuid_vec_t& uuid_list)
{ {
void (uuid_vec_t::* tmp)(LLUUID const &) = &uuid_vec_t::push_back;
if (mInventoryItemsPanel->getVisible()) if (mInventoryItemsPanel->getVisible())
{ {
std::set<LLUUID> item_set = mInventoryItemsPanel->getRootFolder()->getSelectionList(); std::set<LLUUID> item_set = mInventoryItemsPanel->getRootFolder()->getSelectionList();
std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, _1)); std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, _1));
} }
else if (mWearablesListViewPanel->getVisible()) else if (mWearablesListViewPanel->getVisible())
{ {
std::vector<LLSD> item_set; std::vector<LLSD> item_set;
mWearableItemsList->getSelectedValues(item_set); mWearableItemsList->getSelectedValues(item_set);
std::for_each(item_set.begin(), item_set.end(), boost::bind( &uuid_vec_t::push_back, &uuid_list, boost::bind(&LLSD::asUUID, _1 ))); std::for_each(item_set.begin(), item_set.end(), boost::bind( tmp, &uuid_list, boost::bind(&LLSD::asUUID, _1 )));
} }
// return selected_id; // return selected_id;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment