From 8862ddea8df7e5174938ab618756952a782ccaea Mon Sep 17 00:00:00 2001 From: Filipp Pavlov Date: Thu, 17 Sep 2026 15:41:57 +0000 Subject: [PATCH] Post v145 fixes: - convert the rest of CCP_STATS_ZONE macros - move documentation to a project-specific directory --- CMakeLists.txt | 2 +- trinity/Eve/EveTriggerVolume.cpp | 4 ++-- trinity/Eve/SpaceObjectFactory/EveSOF.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6105e9075..fa0d1fc0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ if(CMAKE_PROJECT_NAME STREQUAL carbon-trinity AND NOT BUILD_FOR_PYTHON_2) DOXYGEN_SRC_FILES ${TRINITY_DOCS_SOURCE_FILES} SPHINX_TARGET_NAME Sphinx DOXYGEN_TARGET_NAME Doxygen - INSTALL_DESTINATION documentation + INSTALL_DESTINATION documentation/trinity ) endif() endif() diff --git a/trinity/Eve/EveTriggerVolume.cpp b/trinity/Eve/EveTriggerVolume.cpp index 701579296..a0ef71bc5 100644 --- a/trinity/Eve/EveTriggerVolume.cpp +++ b/trinity/Eve/EveTriggerVolume.cpp @@ -20,7 +20,7 @@ EveTriggerVolume::~EveTriggerVolume() void EveTriggerVolume::RebuildBoundingSphere() { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); m_boundingSphere = CcpMath::Sphere(); @@ -97,7 +97,7 @@ void EveTriggerVolume::UpdateWorldTransform( Be::Time time ) // IEveSpaceObject2 void EveTriggerVolume::UpdateSyncronous( const EveUpdateContext& updateContext ) { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); UpdateWorldTransform( updateContext.GetTime() ); diff --git a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp index 214aeff47..ca6ecef20 100644 --- a/trinity/Eve/SpaceObjectFactory/EveSOF.cpp +++ b/trinity/Eve/SpaceObjectFactory/EveSOF.cpp @@ -313,7 +313,7 @@ bool EveSOF::BuildChild( EveSpaceObject2* newObj, const char* dnaString, uint32_ { std::string s = "BuildChild "; s += std::string( dnaString ); - CCP_STATS_ZONE( s.c_str() ); + TRINITY_STATS_ZONE( s.c_str() ); EveSOFDNAPtr dna = CreateDna( dnaString ); if( dna == nullptr ) @@ -3068,7 +3068,7 @@ void EveSOF::SetupBoosters( EveShip2Ptr ship, const EveSOFDNAPtr dna ) const // -------------------------------------------------------------------------------- void EveSOF::SetupChildBoosters( EveChildContainerPtr child, const EveSOFDNAPtr dna ) const { - CCP_STATS_ZONE( __FUNCTION__ ); + TRINITY_STATS_ZONE( __FUNCTION__ ); // does this hull have boosters at all? if( dna->GetHullBoosterCount() == 0 )