[SOLVED] Eluna + TrinityCore Compiling

[Abundant]

When I compile the Eluna Trinity Core these are the errors I recieve.

Error 1 error C2059: syntax error : '<<' C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1081 1 game
Error 2 error C2143: syntax error : missing ';' before '{' C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1085 1 game
Error 3 error C2447: '{' : missing function header (old-style formal list?) C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1085 1 game
Error 4 error C2143: syntax error : missing ';' before '>>' C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1092 1 game
Error 5 error C2761: 'void WorldObject::_Create(ObjectGuid::LowType,HighGuid,uint32)' : member function redeclaration not allowed C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1092 1 game
Error 6 error C2059: syntax error : '>>' C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1092 1 game
Error 7 error C2143: syntax error : missing ';' before '{' C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1093 1 game
Error 8 error C2447: '{' : missing function header (old-style formal list?) C:\Users\aarons\Desktop\ElunaTrinityWOTLK\TrinityCore\src\server\game\Entities\Object\Object.cpp 1093 1 game

I dont know if this will stop the core from succeeding or not.

 

[Rochet2]

Maybe open the file and see what is there?
Considering someone just posted about a merge error and you have the same file here and the error is about << and >>, you probably have a merge conflict that you have not solved.

Merge conflicts happen when you merge two sources which both edit the same location in the code. Git cant tell what the code is supposed to be like and you need to manually solve the conflict.

 

[Abundant]

Okay and how would I go on about solving this conflict, I am not the most experienced at figuring out C++ issues that's why I wanted to have eluna lua engine. Also thanks for the reply rochet.


This is how I fixed the error when merging Eluna with TrinityCore.

Open up object.cpp and change to the following.

void WorldObject::Update (uint32 time_diff)
{
#ifdef ELUNA
    elunaEvents->Update(time_diff);
#endif
}

void WorldObject::_Create(uint32 guidlow, HighGuid guidhigh, uint32 phaseMask)

After this is done open git bash and doing the following commands.

git status

git add src/server/game/Entities/Object/Object.cpp
git commit

After this a window will open up close it out and do the following

git submodule init

git submodule update

This should fix the Merge conflicts with Eluna and Trinity.