Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop some unused boost lexical_cast includes and associated MSVC pragmas.

Browse Source
This commit is contained in:
Router Gray
2020-05-20 21:09:15 -05:00
parent 3e78b74474
commit 518da73ad2
8 changed files with 23 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llappearance/llavatarappearance.cpp
View File

@@ -24,11 +24,6 @@
* $/LicenseInfo$ * $/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 "linden_common.h"

53
indra/llprimitive/lldaeloader.cpp
View File

@@ -24,35 +24,29 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#if LL_MSVC #include <dae.h>
#pragma warning (disable : 4263) #include <dom/domAsset.h>
#pragma warning (disable : 4264) #include <dom/domBind_material.h>
#endif #include <dom/domCOLLADA.h>
#include "dae.h" #include <dom/domConstants.h>
#include "dom/domAsset.h" #include <dom/domController.h>
#include "dom/domBind_material.h" #include <dom/domEffect.h>
#include "dom/domCOLLADA.h" #include <dom/domGeometry.h>
#include "dom/domConstants.h" #include <dom/domInstance_geometry.h>
#include "dom/domController.h" #include <dom/domInstance_material.h>
#include "dom/domEffect.h" #include <dom/domInstance_node.h>
#include "dom/domGeometry.h" #include <dom/domInstance_effect.h>
#include "dom/domInstance_geometry.h" #include <dom/domMaterial.h>
#include "dom/domInstance_material.h" #include <dom/domMatrix.h>
#include "dom/domInstance_node.h" #include <dom/domNode.h>
#include "dom/domInstance_effect.h" #include <dom/domProfile_COMMON.h>
#include "dom/domMaterial.h" #include <dom/domRotate.h>
#include "dom/domMatrix.h" #include <dom/domScale.h>
#include "dom/domNode.h" #include <dom/domTranslate.h>
#include "dom/domProfile_COMMON.h" #include <dom/domVisual_scene.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 <boost/algorithm/string/replace.hpp>
#include <boost/regex.hpp>
#include "lldaeloader.h" #include "lldaeloader.h"
#include "llsdserialize.h" #include "llsdserialize.h"
@@ -60,8 +54,6 @@
#include "llmatrix4a.h" #include "llmatrix4a.h"
#include <boost/regex.hpp>
#include <boost/algorithm/string/replace.hpp>
std::string colladaVersion[VERSIONTYPE_COUNT+1] = 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; 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, 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) domSource* &pos_source, domSource* &tc_source, domSource* &norm_source)
{ {

1
indra/newview/NACLantispam.cpp
View File

@@ -24,7 +24,6 @@
#include "llviewerobjectlist.h" #include "llviewerobjectlist.h"
#include <time.h> #include <time.h>
#include <boost/lexical_cast.hpp>
class NACLAntiSpamQueue class NACLAntiSpamQueue
{ {

2
indra/newview/llfloatermute.cpp
View File

@@ -45,8 +45,6 @@
#include "llmutelist.h" #include "llmutelist.h"
#include "llnamelistctrl.h" #include "llnamelistctrl.h"
#include <boost/lexical_cast.hpp>
// //
// Constants // Constants
// //

7
indra/newview/llmediadataclient.cpp
View File

@@ -28,13 +28,6 @@
#include "llmediadataclient.h" #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 "llhttpstatuscodes.h"
#include "llsdutil.h" #include "llsdutil.h"
#include "llmediaentry.h" #include "llmediaentry.h"

1
indra/newview/llpanellogin.cpp
View File

@@ -83,7 +83,6 @@
// <edit> // <edit>
#include "llspinctrl.h" #include "llspinctrl.h"
#include "llviewermessage.h" #include "llviewermessage.h"
#include <boost/lexical_cast.hpp>
// </edit> // </edit>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>

12
indra/newview/llvoavatar.cpp
View File

@@ -24,12 +24,6 @@
* $/LicenseInfo$ * $/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 "llviewerprecompiledheaders.h"
#include "llvoavatar.h" #include "llvoavatar.h"
@@ -130,13 +124,7 @@
#include "rlvhandler.h" #include "rlvhandler.h"
// [/RLVa:KB] // [/RLVa:KB]
#if LL_MSVC
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif
#include <boost/algorithm/string/replace.hpp> #include <boost/algorithm/string/replace.hpp>
#include <boost/lexical_cast.hpp>
#if LL_DARWIN #if LL_DARWIN
size_t strnlen(const char *s, size_t n) size_t strnlen(const char *s, size_t n)

11
indra/newview/llvoavatarself.cpp
View File

@@ -24,11 +24,6 @@
* $/LicenseInfo$ * $/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 "llviewerprecompiledheaders.h"
@@ -70,12 +65,6 @@
#include "rlvlocks.h" #include "rlvlocks.h"
// [/RLVa:KB] // [/RLVa:KB]
#if LL_MSVC
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif
#include <boost/lexical_cast.hpp>
LLPointer<LLVOAvatarSelf> gAgentAvatarp = NULL; LLPointer<LLVOAvatarSelf> gAgentAvatarp = NULL;