Linux (not really a) Compile Error

[John Adams]

I see this kind of odd thing show up once in a while in the sources, and it ends up generating an error during compile:

WorldDatabase.cpp, line 3092

Code: Select all

<<<<<<< .mine
}
=======
}

string WorldDatabase::GetColumnNames(char* name){
        Query query;
        MYSQL_ROW row;
        string columns = "";
        MYSQL_RES* result = query.RunQuery2(Q_SELECT, "show columns from %s", name);
        if(result && mysql_num_rows(result) > 0){
                int16 i = 0;
                while((row = mysql_fetch_row(result))){
                        if(strcmp(row[0], "table_data_version") != 0){
                                if(i>0)
                                        columns.append(",");
                                columns.append(row[0]);
                                i++;
                        }
                }
        }
        columns.append("");
        return columns;
}>>>>>>> .r622
~

The resulting compile error is:

Code: Select all

WorldDatabase.cpp:3092: error: expected primary-expression before â<<â token
WorldDatabase.cpp:3092: error: expected primary-expression before â<<â token
WorldDatabase.cpp:3092: error: expected primary-expression before â<<â token
WorldDatabase.cpp:3092: error: expected primary-expression before â<â token
WorldDatabase.cpp:3092: error: expected primary-expression before â.â token
WorldDatabase.cpp:3093: error: expected `;' before â}â token
WorldDatabase.cpp: At global scope:
WorldDatabase.cpp:3094: error: expected unqualified-id before â==â token
WorldDatabase.cpp:3095: error: expected declaration before â}â token

I usually resolve it by svn revert {module.cpp}

Is this caused because the working code has a modification in it that is not on SVN, and "svn" is trying to preserve it? If so, this is a terrible NIX crap concept of Merge But I can live with it. Just trying to understand.

[LethalEncounter]

Yup, that error occurs whenever you make a change locally that svn is not able to merge correctly. If you dont want to save your changes you can either revert it or delete it and do a svn update.

[John Adams]

Yeah I changed the post title, since it's not a valid compile error, in case anyone else ever gets the same thing. Thanks!

Revert is simple enough.

[Zcoretri]

I got compile errors this morning that had to do with the loginserver code.
I uhhh hacked the code to get it to compile for me

[John Adams]

hackar!

You remember what they were? I didn't get any except for this above. I know I didn't change my local linux code, so maybe when LE was in there playing around last night that was some of the changes it tried to preserve - but it was only in WorldDatabase.cpp.

[Zcoretri]

I use windblows with visual studio express 2008

there was no define for CURRENT_DATABASE_TABLE_VERSION among other things
CURRENT_DATABASE_DATA_VERSION
table version struct missing column_names?

[John Adams]

Ah, I am sure that has something to do with the mysteries and mayhem LE is performing behind the curtain today. You do know the entire database update service is getting a face-lift today?

BACKUP YOUR DATAZ!

[LethalEncounter]

Those defines were in version.h, but I have since renamed them.

[Zcoretri]

Oh yeah...kinda forgots about that LOL...I stayed up this morning after feeding dog (6am PST) and I might have pulled down code not fully finished?

EDIT: JA, you have a quick and dirty way to save my character data? I don't have much of anything else that I can't redo, just want to save my toons

[LethalEncounter]

Go ahead and grab it now, it is good to go as far as I know.

[John Adams]

Use the EQ2DBTool.bat in the repack I gave you guys, edit it to point to your server and use Backup Character Data.

[Zcoretri]

Go ahead and grab it now, it is good to go as far as I know.

Yep...good to go. Compiled no prob. Thanks LE

[Zcoretri]

Use the EQ2DBTool.bat in the repack I gave you guys, edit it to point to your server and use Backup Character Data.

You have to run it in a specific place? Get error saying it can't find 'paths'

What are the development and release directories?

[John Adams]

Yeah, you run it where it was extracted.

Or, you can change those paths in the batch file to anything you want really. The repack has directories built into it for DB backup and restore.

[Zcoretri]

Ah, ok....i didn't extract the whole damn zip file just the batch file. I'll fuss with it