diff --git a/changelog.txt b/changelog.txt index 9d4a872e7..31a96a4ba 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,13 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50) ------------------------------------------------------- +== 10/27/2013 == +Uleat: Attempted fix for high level (12) debug compile failiures +Notes: + - Explicit Windows vs. Linus code was not changed due to my inability to compile Linux code + - Only CMake accessible flags were corrected if adding the 'std' namespace did not correct the issue + - the tag [CODEBUG] was added to code identifed by the above note + - If you are having compile issues after this patch is committed, look to the changes here first + == 10/24/2013 == demonstar55: Fix some memory leaks in Mob::SpellOnTarget diff --git a/common/EQPacket.cpp b/common/EQPacket.cpp index 04ce3ce7e..5372a0f9d 100644 --- a/common/EQPacket.cpp +++ b/common/EQPacket.cpp @@ -343,7 +343,7 @@ bool valid=false; uint16 packet_crc=ntohs(*(const uint16 *)(buffer+length-2)); #ifdef EQN_DEBUG if (packet_crc && comp_crc != packet_crc) { - cout << "CRC mismatch: comp=" << hex << comp_crc << ", packet=" << packet_crc << dec << endl; + std::cout << "CRC mismatch: comp=" << std::hex << comp_crc << ", packet=" << packet_crc << std::dec << std::endl; } #endif valid = (!packet_crc || comp_crc == packet_crc); diff --git a/common/EQStream.cpp b/common/EQStream.cpp index 1f5d0ea03..962c2f69a 100644 --- a/common/EQStream.cpp +++ b/common/EQStream.cpp @@ -326,7 +326,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p) break; } #endif - //cout << "Got OP_SessionRequest" << endl; + //std::cout << "Got OP_SessionRequest" << std::endl; init(); OutboundQueueClear(); SessionRequest *Request=(SessionRequest *)p->pBuffer; @@ -654,7 +654,7 @@ void EQStream::Write(int eq_fd) int32 threshold=RateThreshold; MRate.unlock(); if (BytesWritten > threshold) { - //cout << "Over threshold: " << BytesWritten << " > " << threshold << endl; + //std::cout << "Over threshold: " << BytesWritten << " > " << threshold << std::endl; return; } @@ -848,15 +848,15 @@ sockaddr_in address; address.sin_port=remote_port; #ifdef NOWAY uint32 ip=address.sin_addr.s_addr; - cout << "Sending to: " + std::cout << "Sending to: " << (int)*(unsigned char *)&ip << "." << (int)*((unsigned char *)&ip+1) << "." << (int)*((unsigned char *)&ip+2) << "." << (int)*((unsigned char *)&ip+3) - << "," << (int)ntohs(address.sin_port) << "(" << p->size << ")" << endl; + << "," << (int)ntohs(address.sin_port) << "(" << p->size << ")" << std::endl; p->DumpRaw(); - cout << "-------------" << endl; + std::cout << "-------------" << std::endl; #endif length=p->serialize(buffer); if (p->opcode!=OP_SessionRequest && p->opcode!=OP_SessionResponse) { @@ -907,7 +907,7 @@ char temp[15]; *((unsigned char *)&ip+2), *((unsigned char *)&ip+3), ntohs(from->sin_port)); - //cout << timestamp() << "Data from: " << temp << " OpCode 0x" << hex << setw(2) << setfill('0') << (int)p->opcode << dec << endl; + //std::cout << timestamp() << "Data from: " << temp << " OpCode 0x" << std::hex << std::setw(2) << std::setfill('0') << (int)p->opcode << std::dec << std::endl; //dump_message(p->pBuffer,p->size,timestamp()); } diff --git a/common/EQStreamFactory.cpp b/common/EQStreamFactory.cpp index bc0bad34c..403db3627 100644 --- a/common/EQStreamFactory.cpp +++ b/common/EQStreamFactory.cpp @@ -104,8 +104,8 @@ struct sockaddr_in address; fcntl(sock, F_SETFL, O_NONBLOCK); #endif //moved these because on windows the output was delayed and causing the console window to look bad - //cout << "Starting factory Reader" << endl; - //cout << "Starting factory Writer" << endl; + //std::cout << "Starting factory Reader" << std::endl; + //std::cout << "Starting factory Writer" << std::endl; #ifdef _WINDOWS _beginthread(EQStreamFactoryReaderLoop,0, this); _beginthread(EQStreamFactoryWriterLoop,0, this); @@ -119,7 +119,7 @@ struct sockaddr_in address; EQStream *EQStreamFactory::Pop() { EQStream *s=nullptr; - //cout << "Pop():Locking MNewStreams" << endl; + //std::cout << "Pop():Locking MNewStreams" << std::endl; MNewStreams.lock(); if (NewStreams.size()) { s=NewStreams.front(); @@ -127,18 +127,18 @@ EQStream *s=nullptr; s->PutInUse(); } MNewStreams.unlock(); - //cout << "Pop(): Unlocking MNewStreams" << endl; + //std::cout << "Pop(): Unlocking MNewStreams" << std::endl; return s; } void EQStreamFactory::Push(EQStream *s) { - //cout << "Push():Locking MNewStreams" << endl; + //std::cout << "Push():Locking MNewStreams" << std::endl; MNewStreams.lock(); NewStreams.push(s); MNewStreams.unlock(); - //cout << "Push(): Unlocking MNewStreams" << endl; + //std::cout << "Push(): Unlocking MNewStreams" << std::endl; } void EQStreamFactory::ReaderLoop() @@ -240,7 +240,7 @@ void EQStreamFactory::CheckTimeout() //give it a little time for everybody to finish with it } else { //everybody is done, we can delete it now - //cout << "Removing connection" << endl; + //std::cout << "Removing connection" << std::endl; std::map::iterator temp=stream_itr; stream_itr++; //let whoever has the stream outside delete it @@ -318,9 +318,9 @@ Timer DecayTimer(20); stream_count=Streams.size(); MStreams.unlock(); if (!stream_count) { - //cout << "No streams, waiting on condition" << endl; + //std::cout << "No streams, waiting on condition" << std::endl; WriterWork.Wait(); - //cout << "Awake from condition, must have a stream now" << endl; + //std::cout << "Awake from condition, must have a stream now" << std::endl; } } } diff --git a/common/EmuTCPConnection.cpp b/common/EmuTCPConnection.cpp index 872fa915b..465d16c1e 100644 --- a/common/EmuTCPConnection.cpp +++ b/common/EmuTCPConnection.cpp @@ -171,7 +171,7 @@ bool EmuTCPConnection::SendPacket(ServerPacket* pack, uint32 iDestination) { struct in_addr in; in.s_addr = GetrIP(); CoutTimestamp(true); - std::cout << ": Logging outgoing TCP OldPacket. OPCode: 0x" << hex << setw(4) << setfill('0') << pack->opcode << dec << ", size: " << setw(5) << setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; + std::cout << ": Logging outgoing TCP OldPacket. OPCode: 0x" << std::hex << std::setw(4) << std::setfill('0') << pack->opcode << std::dec << ", size: " << std::setw(5) << std::setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; #if TCPN_LOG_PACKETS == 2 if (pack->size >= 32) DumpPacket(pack->pBuffer, 32); @@ -198,7 +198,7 @@ bool EmuTCPConnection::SendPacket(ServerPacket* pack, uint32 iDestination) { struct in_addr in; in.s_addr = GetrIP(); CoutTimestamp(true); - std::cout << ": Logging outgoing TCP packet. OPCode: 0x" << hex << setw(4) << setfill('0') << pack->opcode << dec << ", size: " << setw(5) << setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; + std::cout << ": Logging outgoing TCP packet. OPCode: 0x" << std::hex << std::setw(4) << std::setfill('0') << pack->opcode << std::dec << ", size: " << std::setw(5) << std::setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; #if TCPN_LOG_PACKETS == 2 if (pack->size >= 32) DumpPacket(pack->pBuffer, 32); @@ -237,7 +237,7 @@ bool EmuTCPConnection::SendPacket(EmuTCPNetPacket_Struct* tnps) { struct in_addr in; in.s_addr = GetrIP(); CoutTimestamp(true); - std::cout << ": Logging outgoing TCP NetPacket. OPCode: 0x" << hex << setw(4) << setfill('0') << tnps->opcode << dec << ", size: " << setw(5) << setfill(' ') << tnps->size << " " << inet_ntoa(in) << ":" << GetrPort(); + std::cout << ": Logging outgoing TCP NetPacket. OPCode: 0x" << std::hex << std::setw(4) << std::setfill('0') << tnps->opcode << std::dec << ", size: " << std::setw(5) << std::setfill(' ') << tnps->size << " " << inet_ntoa(in) << ":" << GetrPort(); if (pOldFormat) std::cout << " (OldFormat)"; std::cout << std::endl; @@ -578,7 +578,7 @@ bool EmuTCPConnection::ProcessReceivedDataAsPackets(char* errbuf) { struct in_addr in; in.s_addr = GetrIP(); CoutTimestamp(true); - std::cout << ": Logging incoming TCP packet. OPCode: 0x" << hex << setw(4) << setfill('0') << pack->opcode << dec << ", size: " << setw(5) << setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; + std::cout << ": Logging incoming TCP packet. OPCode: 0x" << std::hex << std::setw(4) << std::setfill('0') << pack->opcode << std::dec << ", size: " << std::setw(5) << std::setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; #if TCPN_LOG_PACKETS == 2 if (pack->size >= 32) DumpPacket(pack->pBuffer, 32); @@ -663,7 +663,7 @@ bool EmuTCPConnection::ProcessReceivedDataAsOldPackets(char* errbuf) { struct in_addr in; in.s_addr = GetrIP(); CoutTimestamp(true); - std::cout << ": Logging incoming TCP OldPacket. OPCode: 0x" << hex << setw(4) << setfill('0') << pack->opcode << dec << ", size: " << setw(5) << setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; + std::cout << ": Logging incoming TCP OldPacket. OPCode: 0x" << std::hex << std::setw(4) << std::setfill('0') << pack->opcode << std::dec << ", size: " << std::setw(5) << std::setfill(' ') << pack->size << " " << inet_ntoa(in) << ":" << GetrPort() << std::endl; #if TCPN_LOG_PACKETS == 2 if (pack->size >= 32) DumpPacket(pack->pBuffer, 32); diff --git a/common/TCPConnection.cpp b/common/TCPConnection.cpp index 5fe7b7ba8..e576f953a 100644 --- a/common/TCPConnection.cpp +++ b/common/TCPConnection.cpp @@ -539,7 +539,7 @@ bool TCPConnection::Process() { if (!RecvData(errbuf)) { struct in_addr in; in.s_addr = GetrIP(); - //cout << inet_ntoa(in) << ":" << GetrPort() << ": " << errbuf << endl; + //std::cout << inet_ntoa(in) << ":" << GetrPort() << ": " << errbuf << std::endl; return false; } /* we break to do the send */ diff --git a/common/TCPServer.h b/common/TCPServer.h index 2ed2e24de..d3eef2e70 100644 --- a/common/TCPServer.h +++ b/common/TCPServer.h @@ -91,7 +91,7 @@ protected: T *data = *cur; if (data->IsFree() && (!data->CheckNetActive())) { #if EQN_DEBUG >= 4 - cout << "TCPConnection Connection deleted." << endl; + std::cout << "TCPConnection Connection deleted." << std::endl; #endif delete data; cur = m_list.erase(cur); diff --git a/common/database.cpp b/common/database.cpp index 8559bc940..1299c199a 100644 --- a/common/database.cpp +++ b/common/database.cpp @@ -199,18 +199,18 @@ bool Database::CheckBannedIPs(const char* loginIP) char errbuf[MYSQL_ERRMSG_SIZE]; char *query = 0; MYSQL_RES *result; - //cout << "Checking against Banned IPs table."<< endl; //Lieka: Debugging + //std::cout << "Checking against Banned IPs table."<< std::endl; //Lieka: Debugging if (RunQuery(query, MakeAnyLenString(&query, "SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP), errbuf, &result)) { safe_delete_array(query); if (mysql_num_rows(result) != 0) { - //cout << loginIP << " was present in the banned IPs table" << endl; //Lieka: Debugging + //std::cout << loginIP << " was present in the banned IPs table" << std::endl; //Lieka: Debugging mysql_free_result(result); return true; } else { - //cout << loginIP << " was not present in the banned IPs table." << endl; //Lieka: Debugging + //std::cout << loginIP << " was not present in the banned IPs table." << std::endl; //Lieka: Debugging mysql_free_result(result); return false; } diff --git a/common/eqtime.cpp b/common/eqtime.cpp index f052a7e2d..7e1eb9f5d 100644 --- a/common/eqtime.cpp +++ b/common/eqtime.cpp @@ -144,7 +144,7 @@ bool EQTime::saveFile(const char *filename) return false; } //Enable for debugging - //cout << "SAVE: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << endl; + //std::cout << "SAVE: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << std::endl; of << EQT_VERSION << std::endl; of << (long)eqTime.start_eqtime.day << std::endl; of << (long)eqTime.start_eqtime.hour << std::endl; @@ -194,7 +194,7 @@ bool EQTime::loadFile(const char *filename) in.ignore(80, '\n'); in >> eqTime.start_realtime; //Enable for debugging... - //cout << "LOAD: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << endl; + //std::cout << "LOAD: day=" << (long)eqTime.start_eqtime.day << ";hour=" << (long)eqTime.start_eqtime.hour << ";min=" << (long)eqTime.start_eqtime.minute << ";mon=" << (long)eqTime.start_eqtime.month << ";yr=" << eqTime.start_eqtime.year << ";timet=" << eqTime.start_realtime << std::endl; in.close(); return true; } diff --git a/common/linked_list.h b/common/linked_list.h index fe8755d40..246677db4 100644 --- a/common/linked_list.h +++ b/common/linked_list.h @@ -337,7 +337,7 @@ ListElement::ListElement(const TYPE& d) template ListElement::~ListElement() { -// cout << "ListElement::~ListElement()" << endl; +// std::cout << "ListElement::~ListElement()" << std::endl; if (data != 0) safe_delete(data); diff --git a/common/packet_dump.cpp b/common/packet_dump.cpp index ec8d94024..a9c70b493 100644 --- a/common/packet_dump.cpp +++ b/common/packet_dump.cpp @@ -78,7 +78,7 @@ void DumpPacketHex(const uchar* buf, uint32 size, uint32 cols, uint32 skip) { else { ascii[j++] = '.'; } -// cout << setfill(0) << setw(2) << hex << (int)buf[i] << " "; +// std::cout << std::setfill(0) << std::setw(2) << std::hex << (int)buf[i] << " "; // unknown intent [CODEBUG] } uint32 k = ((i-skip)-1)%cols; if (k < 8) diff --git a/common/packet_dump_file.cpp b/common/packet_dump_file.cpp index ed0269283..8e0e3c274 100644 --- a/common/packet_dump_file.cpp +++ b/common/packet_dump_file.cpp @@ -80,7 +80,7 @@ void oldFileDumpPacketHex(const char* filename, const uchar* buf, uint32 size, u } sprintf(output, "%02X ",(unsigned char)buf[i]); logfile << output; -// logfile << setfill(0) << setw(2) << hex << (int)buf[i] << " "; + //logfile << std::setfill(0) << std::setw(2) << std::hex << (int)buf[i] << " "; // unknown intent [CODEBUG] } logfile << std::endl << std::endl; } @@ -115,7 +115,7 @@ void FileDumpPacketHex(const char* filename, const uchar* buf, uint32 size, uint else { ascii[j++] = '.'; } -// logfile << setfill(0) << setw(2) << hex << (int)buf[i] << " "; + //logfile << std::setfill(0) << std::setw(2) << std::hex << (int)buf[i] << " "; // unknown intent [CODEBUG] } uint32 k = ((i-skip)-1)%cols; if (k < 8) diff --git a/common/seperator.h b/common/seperator.h index f6438fe5d..2524748d9 100644 --- a/common/seperator.h +++ b/common/seperator.h @@ -57,7 +57,7 @@ public: return; for (i=0; i #include +#include #ifndef WIN32 #include #include "../common/unix.h" @@ -531,7 +532,7 @@ void Client::AddItemBonuses(const ItemInst *inst, StatBonuses* newbon, bool isAu void Client::CalcEdibleBonuses(StatBonuses* newbon) { #if EQDEBUG >= 11 - cout<<"Client::CalcEdibleBonuses(StatBonuses* newbon)"<Check(false)) { #if MobAI_DEBUG_Spells >= 25 - cout << "Non-Engaged autocast check triggered: " << this->GetCleanName() << endl; + std::cout << "Non-Engaged autocast check triggered: " << this->GetCleanName() << std::endl; // cout undefine [CODEBUG] #endif AIautocastspell_timer->Disable(); //prevent the timer from going off AGAIN while we are casting. diff --git a/zone/client.cpp b/zone/client.cpp index 699bd3136..3166c7536 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -721,7 +721,7 @@ void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req, CLIENT_CO void Client::FastQueuePacket(EQApplicationPacket** app, bool ack_req, CLIENT_CONN_STATUS required_state) { - //cout << "Sending: 0x" << hex << setw(4) << setfill('0') << (*app)->GetOpcode() << dec << ", size=" << (*app)->size << endl; + //std::cout << "Sending: 0x" << std::hex << std::setw(4) << std::setfill('0') << (*app)->GetOpcode() << std::dec << ", size=" << (*app)->size << std::endl; // if the program doesnt care about the status or if the status isnt what we requested if (required_state != CLIENT_CONNECTINGALL && client_state != required_state) { @@ -1745,7 +1745,7 @@ void Client::SendManaUpdatePacket() { SendEnduranceUpdate(); } - //cout << "Sending mana update: " << (cur_mana - last_reported_mana) << endl; + //std::cout << "Sending mana update: " << (cur_mana - last_reported_mana) << std::endl; if (last_reported_mana != cur_mana || last_reported_endur != cur_end) { diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 94a95cd9b..037f31f00 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -414,14 +414,14 @@ int Client::HandlePacket(const EQApplicationPacket *app) } #if EQDEBUG >= 9 - std::cout << "Received 0x" << hex << setw(4) << setfill('0') << opcode << ", size=" << dec << app->size << std::endl; + std::cout << "Received 0x" << std::hex << std::setw(4) << std::setfill('0') << opcode << ", size=" << std::dec << app->size << std::endl; #endif #ifdef SOLAR if(0 && opcode != OP_ClientUpdate) { LogFile->write(EQEMuLog::Debug,"HandlePacket() OPCODE debug enabled client %s", GetName()); - std::cerr << "OPCODE: " << hex << setw(4) << setfill('0') << opcode << dec << ", size: " << app->size << std::endl; + std::cerr << "OPCODE: " << std::hex << std::setw(4) << std::setfill('0') << opcode << std::dec << ", size: " << app->size << std::endl; DumpPacket(app); } #endif @@ -2973,7 +2973,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app) /* else if (sa->parameter == 0x05) { // Illusion - cout << "Illusion packet recv'd:" << endl; + std::cout << "Illusion packet recv'd:" << std::endl; DumpPacket(app); } */ @@ -8708,7 +8708,7 @@ bool Client::FinishConnState2(DBAsyncWork* dbaw) { //uint32 aalen = database.GetPlayerAlternateAdv(account_id, name, &aa); //if (aalen == 0) { - // cout << "Client dropped: !GetPlayerAlternateAdv, name=" << name << endl; + // std::cout << "Client dropped: !GetPlayerAlternateAdv, name=" << name << std::endl; // return false; //} diff --git a/zone/entity.cpp b/zone/entity.cpp index e19548465..aae28b9fc 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -130,7 +130,7 @@ Trap* Entity::CastToTrap() #ifdef DEBUG if(!IsTrap()) { - //cout << "CastToTrap error" << endl; + //std::cout << "CastToTrap error" << std::endl; return 0; } #endif @@ -161,7 +161,7 @@ Object* Entity::CastToObject() { /*Group* Entity::CastToGroup() { #ifdef _EQDEBUG if(!IsGroup()) { - cout << "CastToGroup error" << endl; + std::cout << "CastToGroup error" << std::endl; DebugBreak(); return 0; } @@ -230,7 +230,7 @@ const Trap* Entity::CastToTrap() const { #ifdef DEBUG if(!IsTrap()) { - //cout << "CastToTrap error" << endl; + //std::cout << "CastToTrap error" << std::endl; return 0; } #endif diff --git a/zone/maxskill.h b/zone/maxskill.h index d9f8b4ff5..8979d4814 100644 --- a/zone/maxskill.h +++ b/zone/maxskill.h @@ -1,3 +1,5 @@ +// This file needs more than just 'std' updates + uint16 Mob::MaxSkill_weapon(uint16 skillid, uint16 class_, uint16 level) const{ if (skillid > HIGHEST_SKILL) return 0; @@ -273,7 +275,7 @@ uint16 Mob::MaxSkill_weapon(uint16 skillid, uint16 class_, uint16 level) const{ } default: #if EQDEBUG - cout<<"MaxSkill_Weapon() Unknown class: "<= 1 - cout<<"Unknown Offensive skill: "< 0 && in_race <= GNOME ) || in_race == IKSAR || in_race == VAHSHIR || in_race == FROGLOK || in_race == DRAKKIN || in_race == 15 || in_race == 50 || in_race == 57 || in_race == 70 || in_race == 98 || in_race == 118) { @@ -2775,7 +2775,7 @@ int16 Mob::GetResist(uint8 type) const uint32 Mob::GetLevelHP(uint8 tlevel) { - //cout<<"Tlevel: "<<(int)tlevel<item_id == item_id && item->equipSlot == slot && quantity >= 1) { - //cout<<"NPC::RemoveItem"<<" equipSlot:"<equipSlot<<" quantity:"<< quantity<equipSlot<<" quantity:"<< quantity<charges <= quantity) itemlist.erase(cur); else diff --git a/zone/zonedbasync.cpp b/zone/zonedbasync.cpp index e07b28d6e..4d1bf8491 100644 --- a/zone/zonedbasync.cpp +++ b/zone/zonedbasync.cpp @@ -21,11 +21,11 @@ void DispatchFinishedDBAsync(DBAsyncWork* dbaw) { if (dbaq->GetAnswer(errbuf, result)) database.LoadVariables_result(result); else - cout << "Async DB.LoadVariables() failed: '" << errbuf << "'" << endl; + std::cout << "Async DB.LoadVariables() failed: '" << errbuf << "'" << std::endl; break; } default: { - cout << "Error: DispatchFinishedDBAsync(): Unknown workpt.b4" << endl; + std::cout << "Error: DispatchFinishedDBAsync(): Unknown workpt.b4" << std::endl; break; } } @@ -119,7 +119,7 @@ bool DBAsyncCB_CharacterBackup(DBAsyncWork* iWork) { // return true means delete } } else { -// cout << "Error in DBAsyncCB_CharacterBackup query1 '" << query << "' " << errbuf << endl; +// std::cout << "Error in DBAsyncCB_CharacterBackup query1 '" << query << "' " << errbuf << std::endl; safe_delete_array(query); return true; }