Skip to content

refactor(utils): Move STLUtils.h to WWLib #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 9, 2025
Merged

refactor(utils): Move STLUtils.h to WWLib #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99dfc71
refactor(utils): Move STLUtils.h to WWLib
xezon Oct 8, 2025
e8b190e
Avoid wild VC6 fatal error C1001: INTERNAL COMPILER ERROR
xezon Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Core/GameEngine/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ set(GAMEENGINE_SRC
# Include/Common/StateMachine.h
# Include/Common/StatsCollector.h
# Include/Common/STLTypedefs.h
Include/Common/STLUtils.h
Include/Common/StreamingArchiveFile.h
# Include/Common/SubsystemInterface.h
# Include/Common/SystemInfo.h
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ PersistClass * RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const
// if the object we saved didn't have a name, replace it with null
if (strlen(name) == 0) {
static int count = 0;
if ( ++count < 10 ) {
if ( count++ < 10 ) {
WWDEBUG_SAY(("RenderObjPersistFactory attempted to load an un-named render object!"));
WWDEBUG_SAY(("Replacing it with a NULL render object!"));
}
Expand All @@ -1254,7 +1254,7 @@ PersistClass * RenderObjPersistFactoryClass::Load(ChunkLoadClass & cload) const

if (new_obj == NULL) {
static int count = 0;
if ( ++count < 10 ) {
if ( count++ < 10 ) {
WWDEBUG_SAY(("RenderObjPersistFactory failed to create object: %s!!",name));
WWDEBUG_SAY(("Either the asset for this object is gone or you tried to save a procedural object."));
WWDEBUG_SAY(("Replacing it with a NULL render object!"));
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WWAudio/WWAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ WWAudioClass::Get_Sound_Buffer (const char *filename, bool is_3d)
buffer = Create_Sound_Buffer (*file, filename, is_3d);
} else {
static int count = 0;
if ( ++count < 10 ) {
if ( count++ < 10 ) {
WWDEBUG_SAY(( "Sound \"%s\" not found", filename ));
}
}
Expand Down Expand Up @@ -807,7 +807,7 @@ WWAudioClass::Create_3D_Sound
sound_obj->Set_Buffer (buffer);
} else {
static int count = 0;
if ( ++count < 10 ) {
if ( count++ < 10 ) {
WWDEBUG_SAY(( "Sound File not Found \"%s\"", filename ));
}
}
Expand Down
1 change: 1 addition & 0 deletions Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ set(WWLIB_SRC
SLNODE.H
stimer.cpp
stimer.h
STLUtils.h
straw.cpp
STRAW.H
stringex.h
Expand Down
0 Core/GameEngine/Include/Common/STLUtils.h → ...Libraries/Source/WWVegas/WWLib/STLUtils.h
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions Core/Libraries/Source/WWVegas/WWLib/WWCommon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#pragma once

#include "STLUtils.h"
#include "stringex.h"


Expand Down
1 change: 0 additions & 1 deletion Generals/Code/GameEngine/Include/Common/STLTypedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class STLSpecialAlloc;
#include "Common/UnicodeString.h"
#include "Common/GameCommon.h"
#include "Common/GameMemory.h"
#include "Common/STLUtils.h"

//-----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,7 +1395,7 @@ PersistClass * DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
*/
if (new_obj == NULL) {
static int count = 0;
if ( ++count < 10 ) {
if ( count++ < 10 ) {
WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!",dazzle_type));
WWDEBUG_SAY(("Replacing it with a NULL render object!"));
}
Expand Down
1 change: 0 additions & 1 deletion GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class STLSpecialAlloc;
#include "Common/UnicodeString.h"
#include "Common/GameCommon.h"
#include "Common/GameMemory.h"
#include "Common/STLUtils.h"

//-----------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@ PersistClass * DazzlePersistFactoryClass::Load(ChunkLoadClass & cload) const
*/
if (new_obj == NULL) {
static int count = 0;
if ( ++count < 10 ) {
if ( count++ < 10 ) {
WWDEBUG_SAY(("DazzlePersistFactory failed to create dazzle of type: %s!!",dazzle_type));
WWDEBUG_SAY(("Replacing it with a NULL render object!"));
}
Expand Down
Loading