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

Revert "tentative workaround for gcc c++20 std::lerp clash" 

This reverts commit 19999b5858.
master
Ansariel 2025-03-08 23:46:30 +01:00
parent 19999b5858
commit 98a96cf033
33 changed files with 9 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcharacter/llmotion.cpp
View File

@ -32,12 +32,6 @@
#include "llmotion.h"
#include "llcriticaldamp.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// LLMotion class

40
indra/llcommon/llfasttimer.cpp
View File

@ -325,37 +325,14 @@ void BlockTimer::processTimes()
#endif
}
// Define a static empty vector that will be used for the root's children.
static std::vector<BlockTimerStatHandle*> sEmptyChildren;
std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::beginChildren()
{
// If this is the root node, return an iterator over an empty container.
if (this == &BlockTimer::getRootTimeBlock())
{
return sEmptyChildren.begin();
}
auto it = getTreeNode().mChildren.begin();
while (it != getTreeNode().mChildren.end() && *it == nullptr)
{
++it;
}
return it;
}
{
return getTreeNode().mChildren.begin();
}
std::vector<BlockTimerStatHandle*>::iterator BlockTimerStatHandle::endChildren()
{
// For the root node, return the end iterator of the empty container.
if (this == &BlockTimer::getRootTimeBlock())
{
return sEmptyChildren.end();
}
auto it = getTreeNode().mChildren.end();
while (it != getTreeNode().mChildren.begin() && *(it - 1) == nullptr)
{
--it;
}
return it;
{
return getTreeNode().mChildren.end();
}
std::vector<BlockTimerStatHandle*>& BlockTimerStatHandle::getChildren()
@ -421,13 +398,6 @@ void BlockTimer::dumpCurTimes()
LLTrace::PeriodicRecording& frame_recording = LLTrace::get_frame_recording();
LLTrace::Recording& last_frame_recording = frame_recording.getLastRecording();
// If the root timer's children container is empty,
// there's nothing to traverse so we simply return.
if ( BlockTimer::getRootTimeBlock().getTreeNode().mChildren.empty() )
{
return;
}
// walk over timers in depth order and output timings
for(block_timer_tree_df_iterator_t it = begin_timer_tree(BlockTimer::getRootTimeBlock());
it != end_timer_tree();

6
indra/llinventory/llsettingsbase.cpp
View File

@ -33,12 +33,6 @@
#include "llsdserialize.h"
#include <boost/bind.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//=========================================================================
namespace
{

7
indra/llinventory/llsettingssky.cpp
View File

@ -32,11 +32,8 @@
#include "llfasttimer.h"
#include "v3colorutil.h"
#include <boost/bind.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//=========================================================================
namespace
{

6
indra/llinventory/llsettingswater.cpp
View File

@ -33,12 +33,6 @@
#include "indra_constants.h"
#include <boost/bind.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
const std::string LLSettingsWater::SETTING_BLUR_MULTIPLIER("blur_multiplier");
const std::string LLSettingsWater::SETTING_FOG_COLOR("water_fog_color");
const std::string LLSettingsWater::SETTING_FOG_DENSITY("water_fog_density");

4
indra/llmath/llmath.h
View File

@ -358,12 +358,10 @@ inline F32 snap_to_sig_figs(F32 foo, S32 sig_figs)
return new_foo;
}
#if __cplusplus < 202002L
inline F32 lerp(F32 a, F32 b, F32 u)
{
return a + ((b - a) * u);
}
#endif
inline F32 lerp2d(F32 x00, F32 x01, F32 x10, F32 x11, F32 u, F32 v)
{
@ -380,7 +378,7 @@ inline F32 ramp(F32 x, F32 a, F32 b)
inline F32 rescale(F32 x, F32 x1, F32 x2, F32 y1, F32 y2)
{
return std::lerp(y1, y2, ramp(x, x1, x2));
return lerp(y1, y2, ramp(x, x1, x2));
}
inline F32 clamp_rescale(F32 x, F32 x1, F32 x2, F32 y1, F32 y2)

6
indra/llmath/llvolume.cpp
View File

@ -57,12 +57,6 @@
#include "meshoptimizer/meshoptimizer.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
#define DEBUG_SILHOUETTE_BINORMALS 0
#define DEBUG_SILHOUETTE_NORMALS 0 // TomY: Use this to display normals using the silhouette
#define DEBUG_SILHOUETTE_EDGE_MAP 0 // DaveP: Use this to display edge map using the silhouette

5
indra/llrender/llrender2dutils.cpp
View File

@ -41,11 +41,6 @@
#include "llrender2dutils.h"
#include "lluiimage.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//
// Globals

6
indra/llui/llbutton.cpp
View File

@ -56,12 +56,6 @@
#include "llcheckboxctrl.h" // <FS:Zi> Add checkbox control toggle
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
static LLDefaultChildRegistry::Register<LLButton> r("button");
// Compiler optimization, generate extern template

5
indra/llui/llfloater.cpp
View File

@ -60,11 +60,6 @@
#include "llsdutil.h"
#include "lluiusage.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// use this to control "jumping" behavior when Ctrl-Tabbing
const S32 TABBED_FLOATER_OFFSET = 0;

2
indra/llui/llfocusmgr.h
View File

@ -101,7 +101,7 @@ public:
void setKeystrokesOnly(bool keystrokes_only) { mKeystrokesOnly = keystrokes_only; }
F32 getFocusFlashAmt() const;
S32 getFocusFlashWidth() const { return ll_round(std::lerp(1.f, 3.f, getFocusFlashAmt())); }
S32 getFocusFlashWidth() const { return ll_round(lerp(1.f, 3.f, getFocusFlashAmt())); }
LLColor4 getFocusColor() const;
void triggerFocusFlash();
bool getAppHasFocus() const { return mAppHasFocus; }

6
indra/llui/llfolderviewitem.cpp
View File

@ -41,12 +41,6 @@
#include "lltrans.h"
#include "llwindow.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
///----------------------------------------------------------------------------
/// Class LLFolderViewItem
///----------------------------------------------------------------------------

6
indra/llui/lllayoutstack.cpp
View File

@ -36,12 +36,6 @@
#include "lliconctrl.h"
#include "boost/foreach.hpp"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
static const F32 MIN_FRACTIONAL_SIZE = 0.00001f;
static const F32 MAX_FRACTIONAL_SIZE = 1.f;

7
indra/llui/llmenugl.cpp
View File

@ -62,13 +62,6 @@
#include <boost/tokenizer.hpp>
#include "llclipboard.h" // <FS:ND/ To let someone copy a menus text + accelerator to clipboard
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// static
LLMenuHolderGL *LLMenuGL::sMenuContainer = NULL;
view_listener_t::listener_map_t view_listener_t::sListeners;

6
indra/llui/llscrollbar.cpp
View File

@ -42,12 +42,6 @@
#include "llrender.h"
#include "lluictrlfactory.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
static LLDefaultChildRegistry::Register<LLScrollbar> register_scrollbar("scroll_bar");
LLScrollbar::Params::Params()

6
indra/llui/llstatbar.cpp
View File

@ -42,12 +42,6 @@
#include <iostream>
#include "lltrans.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// rate at which to update display of value that is rapidly changing
const F32 MEAN_VALUE_UPDATE_TIME = 1.f / 4.f;
// time between value changes that qualifies as a "rapid change"

5
indra/llui/lltabcontainer.cpp
View File

@ -40,11 +40,6 @@
#include "lltrans.h"
#include "lluiusage.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//----------------------------------------------------------------------------
// Implementation Notes:

6
indra/llui/llviewborder.cpp
View File

@ -30,12 +30,6 @@
#include "lluictrlfactory.h"
#include "lluiimage.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
static LLDefaultChildRegistry::Register<LLViewBorder> r("view_border");
void LLViewBorder::BevelValues::declareValues()

6
indra/newview/llagentcamera.cpp
View File

@ -58,12 +58,6 @@
#include "fscommon.h"
#include "lltrans.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
using namespace LLAvatarAppearanceDefines;
extern LLMenuBarGL* gMenuBarView;

6
indra/newview/llagentpilot.cpp
View File

@ -38,12 +38,6 @@
#include "llsdserialize.h"
#include "llsdutil_math.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
LLAgentPilot gAgentPilot;
LLAgentPilot::LLAgentPilot() :

6
indra/newview/llenvironment.cpp
View File

@ -70,12 +70,6 @@
#include "fscommon.h"
#include "llviewernetwork.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//=========================================================================
namespace
{

7
indra/newview/llfasttimerview.cpp
View File

@ -55,13 +55,6 @@
#include "llmetricperformancetester.h"
#include "llviewerstats.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
//////////////////////////////////////////////////////////////////////////////
using namespace LLTrace;

6
indra/newview/llflexibleobject.cpp
View File

@ -43,12 +43,6 @@
#include "llworld.h"
#include "llvoavatar.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
static const F32 SEC_PER_FLEXI_FRAME = 1.f / 60.f; // 60 flexi updates per second
/*static*/ F32 LLVolumeImplFlexible::sUpdateFactor = 1.0f;
std::vector<LLVolumeImplFlexible*> LLVolumeImplFlexible::sInstanceList;

7
indra/newview/llhudtext.cpp
View File

@ -51,13 +51,6 @@
#include "rlvcommon.h"
// [/RLVa:KB]
#include <boost/tokenizer.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
const F32 HORIZONTAL_PADDING = 15.f;
const F32 VERTICAL_PADDING = 12.f;
const F32 BUFFER_SIZE = 2.f;

7
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -47,13 +47,6 @@
#include "llviewermenu.h"
#include "llviewernetwork.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// History (may be apocryphal)
//
// Around V2, an HTTP inventory download mechanism was added

7
indra/newview/llmanipscale.cpp
View File

@ -62,13 +62,6 @@
#include "llmeshrepository.h"
#include "lltrans.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
const F32 MAX_MANIP_SELECT_DISTANCE_SQUARED = 11.f * 11.f;
const F32 SNAP_GUIDE_SCREEN_OFFSET = 0.05f;
const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;

8
indra/newview/llmaniptranslate.cpp
View File

@ -66,14 +66,6 @@
#include "rlvhandler.h"
// [/RLVa:KB]
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
const S32 NUM_AXES = 3;
const S32 MOUSE_DRAG_SLOP = 2; // pixels
const F32 SELECTED_ARROW_SCALE = 1.3f;

7
indra/newview/llpanelprimmediacontrols.cpp
View File

@ -65,13 +65,6 @@
#include <glm/gtx/transform2.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// Functions pulled from llviewerdisplay.cpp
bool get_hud_matrices(glm::mat4 &proj, glm::mat4 &model);

7
indra/newview/llsnapshotlivepreview.cpp
View File

@ -57,13 +57,6 @@
#include "llworld.h"
#include <boost/filesystem.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
constexpr F32 AUTO_SNAPSHOT_TIME_DELAY = 1.f;
constexpr F32 SHINE_TIME = 0.5f;

7
indra/newview/llviewerdisplay.cpp
View File

@ -104,13 +104,6 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
extern LLPointer<LLViewerTexture> gStartTexture;
extern bool gShiftFrame;

7
indra/newview/llviewerpartsim.cpp
View File

@ -43,13 +43,6 @@
#include "llvoavatarself.h"
#include "llvovolume.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
const F32 PART_SIM_BOX_SIDE = 16.f;
//static

7
indra/newview/llvisualeffect.cpp
View File

@ -21,13 +21,6 @@
#include <boost/iterator/filter_iterator.hpp>
#include <boost/range/iterator_range.hpp>
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// ============================================================================
// LLTweenableValue class
//

6
indra/newview/llworldmapview.cpp
View File

@ -69,12 +69,6 @@
#include "llglheaders.h"
// <FS:Beq> use std::lerp for C++20
#if __cplusplus >= 202002L
using std::lerp;
#endif
// </FS:Beq>
// # Constants
static constexpr F32 MAP_DEFAULT_SCALE = 128.f;
static constexpr F32 MAP_ITERP_TIME_CONSTANT = 0.75f;