Skip to content

Commit

Permalink
Merge Get rid of custom allocators definition for EASTL (mr-464)
Browse files Browse the repository at this point in the history
e37cd05 - fix(eastl): update eastl
  • Loading branch information
prikolium-cfx committed Aug 15, 2024
2 parents 0ee6880 + e37cd05 commit 1884fe7
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 100 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@

#include <shared_mutex>

void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

namespace rl
{
bool MessageBufferLengthHack::GetState()
Expand Down
11 changes: 0 additions & 11 deletions code/components/citizen-server-impl/src/EnetUv.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,6 @@ struct send_deleter
#define ENET_BUILDING_LIB 1
#include "enet/enet.h"

// needed for eastl
void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

static std::chrono::nanoseconds timeBase{ 0 };

extern "C" int
Expand Down
12 changes: 0 additions & 12 deletions code/components/citizen-server-state/src/EastlDeps.cpp

This file was deleted.

10 changes: 0 additions & 10 deletions code/components/devcon/src/DevConServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -431,14 +431,4 @@ static InitFunction initFunction([]()
});
});
});

void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}
#endif
10 changes: 0 additions & 10 deletions code/components/gta-core-five/src/FontFormatFixes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,6 @@ std::string regex_replace(const std::string& s,

static uint32_t curTime;

void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

static void ParseHtmlStub(void* styledText, const wchar_t* str, int64_t length, void* pImgInfoArr, bool multiline, bool condenseWhite, void* styleMgr, void* txtFmt, void* paraFmt)
{
if (!txtFmt)
Expand Down
12 changes: 1 addition & 11 deletions code/components/net-http-server/src/HttpServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,4 @@ std::string_view HttpResponse::GetStatusMessage(int statusCode)

return {};
}
}

void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}
}
12 changes: 1 addition & 11 deletions code/components/ros-patches-five/src/VersioningStub.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,4 @@ static InitFunction initFunction([] ()
// also register the versioning handler for ROS SCUI
EndpointMapper* endpointMapper = Instance<EndpointMapper>::Get();
endpointMapper->AddPrefix("/public/", publicHandler);
});

void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}
});
11 changes: 0 additions & 11 deletions code/components/voip-server-mumble/src/client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,6 @@

#include <EASTL/fixed_set.h>

// needed for eastl
void* operator new[](size_t size, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

void* operator new[](size_t size, size_t alignment, size_t alignmentOffset, const char* pName, int flags, unsigned debugFlags, const char* file, int line)
{
return ::operator new[](size);
}

extern char system_string[], version_string[];

static int Client_read(client_t *client);
Expand Down
13 changes: 0 additions & 13 deletions code/tests/EastlAllocator.cpp

This file was deleted.

2 changes: 1 addition & 1 deletion vendor/eastl

0 comments on commit 1884fe7

Please sign in to comment.