Drop some unused boost lexical_cast includes and associated MSVC pragmas.
This commit is contained in:
@@ -24,11 +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"
|
||||
|
||||
|
||||
@@ -24,35 +24,29 @@
|
||||
* $/LicenseInfo$
|
||||
*/
|
||||
|
||||
#if LL_MSVC
|
||||
#pragma warning (disable : 4263)
|
||||
#pragma warning (disable : 4264)
|
||||
#endif
|
||||
#include "dae.h"
|
||||
#include "dom/domAsset.h"
|
||||
#include "dom/domBind_material.h"
|
||||
#include "dom/domCOLLADA.h"
|
||||
#include "dom/domConstants.h"
|
||||
#include "dom/domController.h"
|
||||
#include "dom/domEffect.h"
|
||||
#include "dom/domGeometry.h"
|
||||
#include "dom/domInstance_geometry.h"
|
||||
#include "dom/domInstance_material.h"
|
||||
#include "dom/domInstance_node.h"
|
||||
#include "dom/domInstance_effect.h"
|
||||
#include "dom/domMaterial.h"
|
||||
#include "dom/domMatrix.h"
|
||||
#include "dom/domNode.h"
|
||||
#include "dom/domProfile_COMMON.h"
|
||||
#include "dom/domRotate.h"
|
||||
#include "dom/domScale.h"
|
||||
#include "dom/domTranslate.h"
|
||||
#include "dom/domVisual_scene.h"
|
||||
#if LL_MSVC
|
||||
#pragma warning (default : 4263)
|
||||
#pragma warning (default : 4264)
|
||||
#endif
|
||||
#include <dae.h>
|
||||
#include <dom/domAsset.h>
|
||||
#include <dom/domBind_material.h>
|
||||
#include <dom/domCOLLADA.h>
|
||||
#include <dom/domConstants.h>
|
||||
#include <dom/domController.h>
|
||||
#include <dom/domEffect.h>
|
||||
#include <dom/domGeometry.h>
|
||||
#include <dom/domInstance_geometry.h>
|
||||
#include <dom/domInstance_material.h>
|
||||
#include <dom/domInstance_node.h>
|
||||
#include <dom/domInstance_effect.h>
|
||||
#include <dom/domMaterial.h>
|
||||
#include <dom/domMatrix.h>
|
||||
#include <dom/domNode.h>
|
||||
#include <dom/domProfile_COMMON.h>
|
||||
#include <dom/domRotate.h>
|
||||
#include <dom/domScale.h>
|
||||
#include <dom/domTranslate.h>
|
||||
#include <dom/domVisual_scene.h>
|
||||
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
#include "lldaeloader.h"
|
||||
#include "llsdserialize.h"
|
||||
@@ -60,8 +54,6 @@
|
||||
|
||||
#include "llmatrix4a.h"
|
||||
|
||||
#include <boost/regex.hpp>
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
|
||||
std::string colladaVersion[VERSIONTYPE_COUNT+1] =
|
||||
{
|
||||
@@ -80,6 +72,7 @@ static const std::string lod_suffix[LLModel::NUM_LODS] =
|
||||
};
|
||||
|
||||
const U32 LIMIT_MATERIALS_OUTPUT = 12;
|
||||
|
||||
bool get_dom_sources(const domInputLocalOffset_Array& inputs, S32& pos_offset, S32& tc_offset, S32& norm_offset, S32 &idx_stride,
|
||||
domSource* &pos_source, domSource* &tc_source, domSource* &norm_source)
|
||||
{
|
||||
|
||||
@@ -24,7 +24,6 @@
|
||||
#include "llviewerobjectlist.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
class NACLAntiSpamQueue
|
||||
{
|
||||
|
||||
@@ -45,8 +45,6 @@
|
||||
#include "llmutelist.h"
|
||||
#include "llnamelistctrl.h"
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
//
|
||||
// Constants
|
||||
//
|
||||
|
||||
@@ -28,13 +28,6 @@
|
||||
|
||||
#include "llmediadataclient.h"
|
||||
|
||||
#if LL_MSVC
|
||||
// disable boost::lexical_cast warning
|
||||
#pragma warning (disable:4702)
|
||||
#endif
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#include "llhttpstatuscodes.h"
|
||||
#include "llsdutil.h"
|
||||
#include "llmediaentry.h"
|
||||
|
||||
@@ -83,7 +83,6 @@
|
||||
// <edit>
|
||||
#include "llspinctrl.h"
|
||||
#include "llviewermessage.h"
|
||||
#include <boost/lexical_cast.hpp>
|
||||
// </edit>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
|
||||
@@ -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 "llviewerprecompiledheaders.h"
|
||||
|
||||
#include "llvoavatar.h"
|
||||
@@ -130,13 +124,7 @@
|
||||
#include "rlvhandler.h"
|
||||
// [/RLVa:KB]
|
||||
|
||||
#if LL_MSVC
|
||||
// disable boost::lexical_cast warning
|
||||
#pragma warning (disable:4702)
|
||||
#endif
|
||||
|
||||
#include <boost/algorithm/string/replace.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
#if LL_DARWIN
|
||||
size_t strnlen(const char *s, size_t n)
|
||||
|
||||
@@ -24,11 +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 "llviewerprecompiledheaders.h"
|
||||
|
||||
@@ -70,12 +65,6 @@
|
||||
#include "rlvlocks.h"
|
||||
// [/RLVa:KB]
|
||||
|
||||
#if LL_MSVC
|
||||
// disable boost::lexical_cast warning
|
||||
#pragma warning (disable:4702)
|
||||
#endif
|
||||
|
||||
#include <boost/lexical_cast.hpp>
|
||||
|
||||
LLPointer<LLVOAvatarSelf> gAgentAvatarp = NULL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user