SL-20781 Follow up on boost to std replacement
parent
7c8907522f
commit
e5ef481cd3
|
|
@ -64,6 +64,8 @@ Aimee Trescothick
|
|||
VWR-14711
|
||||
VWR-14712
|
||||
VWR-15454
|
||||
AiraYumi
|
||||
SL-20781 (github PR #613)
|
||||
Alejandro Rosenthal
|
||||
VWR-1184
|
||||
Aleric Inglewood
|
||||
|
|
|
|||
|
|
@ -24,12 +24,6 @@
|
|||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#if LL_MSVC
|
||||
// disable warning about boost::lexical_cast returning uninitialized data
|
||||
// when it fails to parse the string
|
||||
#pragma warning (disable:4701)
|
||||
#endif
|
||||
|
||||
#include "linden_common.h"
|
||||
|
||||
#include "llavatarappearance.h"
|
||||
|
|
@ -46,14 +40,6 @@
|
|||
#include "boost/bind.hpp"
|
||||
#include "boost/tokenizer.hpp"
|
||||
|
||||
|
||||
#if LL_MSVC
|
||||
// disable boost::lexical_cast warning
|
||||
#pragma warning (disable:4702)
|
||||
#endif
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
using namespace LLAvatarAppearanceDefines;
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -53,8 +53,6 @@
|
|||
#pragma warning (default : 4264)
|
||||
#endif
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include "lldaeloader.h"
|
||||
#include "llsdserialize.h"
|
||||
#include "lljoint.h"
|
||||
|
|
@ -2385,7 +2383,7 @@ std::string LLDAELoader::getElementLabel(daeElement *element)
|
|||
|
||||
if (ind > 0)
|
||||
{
|
||||
index_string = "_" + boost::lexical_cast<std::string>(ind);
|
||||
index_string = "_" + std::to_string(ind);
|
||||
}
|
||||
|
||||
// if parent has a name or ID, use it
|
||||
|
|
|
|||
|
|
@ -48,8 +48,6 @@
|
|||
|
||||
// TODO: includes inherited from dae loader. Validate / prune
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include "llsdserialize.h"
|
||||
#include "lljoint.h"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue