git-svn-id: svn://db.shs.com.ru/pip@586 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -846,7 +846,7 @@ PIString PICodeParser::procMacros(PIString fc) {
|
|||||||
nfc.clear();
|
nfc.clear();
|
||||||
} else {
|
} else {
|
||||||
if (!parseDirective(line.cutLeft(1).trim()))
|
if (!parseDirective(line.cutLeft(1).trim()))
|
||||||
;//return false; /// WARNING
|
;//return false; /// WARNING: now skip errors
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (grab) nfc << line << "\n";
|
if (grab) nfc << line << "\n";
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ void TileVars::drawEvent(PIScreenDrawer *d) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
PIScreenConsole::PIScreenConsole() {
|
PIScreenConsoleTile::PIScreenConsoleTile() {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,10 +68,10 @@ protected:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
class PIScreenConsole : public PIScreenTile
|
class PIScreenConsoleTile : public PIScreenTile
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PIScreenConsole();
|
PIScreenConsoleTile();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // PISCREENCONSOLE_H
|
#endif // PISCREENCONSOLE_H
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ static const uchar binlog_sig[] = {'B','I','N','L','O','G'};
|
|||||||
}
|
}
|
||||||
#define PIBINARYLOG_SIGNATURE_SIZE sizeof(__S__PIBinaryLog::binlog_sig)
|
#define PIBINARYLOG_SIGNATURE_SIZE sizeof(__S__PIBinaryLog::binlog_sig)
|
||||||
|
|
||||||
/// TODO: Create static functions to split and join binlog files
|
/// TODO: Create static functions to join binlog files
|
||||||
/// TODO: Create functions to insert and delete records
|
/// TODO: Create functions to insert and delete records
|
||||||
class PIBinaryLog: public PIIODevice
|
class PIBinaryLog: public PIIODevice
|
||||||
{
|
{
|
||||||
@@ -223,7 +223,7 @@ public:
|
|||||||
BinLogInfo logInfo() const {if (is_indexed) return binfo; return getLogInfo(path());}
|
BinLogInfo logInfo() const {if (is_indexed) return binfo; return getLogInfo(path());}
|
||||||
|
|
||||||
//! Get binlog index \a BinLogIndex, need \a createIndex before getting index
|
//! Get binlog index \a BinLogIndex, need \a createIndex before getting index
|
||||||
const PIVector<BinLogIndex> & logIndex() const {return index;} /// TODO: Think about index positions
|
const PIVector<BinLogIndex> & logIndex() const {return index;}
|
||||||
|
|
||||||
//! Create index of current binlog file
|
//! Create index of current binlog file
|
||||||
bool createIndex();
|
bool createIndex();
|
||||||
@@ -238,7 +238,7 @@ public:
|
|||||||
bool seek(llong filepos);
|
bool seek(llong filepos);
|
||||||
|
|
||||||
//! Get current record index (position record in file)
|
//! Get current record index (position record in file)
|
||||||
int pos() const {if (is_indexed) return current_index; return -1;} /// TODO: Think about index positions
|
int pos() const {if (is_indexed) return current_index; return -1;}
|
||||||
|
|
||||||
//! \handlers
|
//! \handlers
|
||||||
//! \{
|
//! \{
|
||||||
@@ -266,7 +266,7 @@ public:
|
|||||||
EVENT(fileEnd)
|
EVENT(fileEnd)
|
||||||
EVENT(fileError)
|
EVENT(fileError)
|
||||||
EVENT1(newFile, const PIString &, filename)
|
EVENT1(newFile, const PIString &, filename)
|
||||||
EVENT1(posChanged, int, pos) /// TODO: Think about index positions
|
EVENT1(posChanged, int, pos)
|
||||||
|
|
||||||
//! Get binlog info and statistic
|
//! Get binlog info and statistic
|
||||||
static BinLogInfo getLogInfo(const PIString & path);
|
static BinLogInfo getLogInfo(const PIString & path);
|
||||||
|
|||||||
@@ -526,7 +526,6 @@ bool PIEthernet::leaveMulticastGroup(const PIString & group) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
PIFlags<Parameters> params = parameters();
|
PIFlags<Parameters> params = parameters();
|
||||||
/// TODO windows
|
|
||||||
addr_r.set(path());
|
addr_r.set(path());
|
||||||
struct ip_mreqn mreq;
|
struct ip_mreqn mreq;
|
||||||
memset(&mreq, 0, sizeof(mreq));
|
memset(&mreq, 0, sizeof(mreq));
|
||||||
|
|||||||
@@ -29,13 +29,14 @@
|
|||||||
#include "pidir.h"
|
#include "pidir.h"
|
||||||
#include "pibinarylog.h"
|
#include "pibinarylog.h"
|
||||||
#include "pifiletransfer.h"
|
#include "pifiletransfer.h"
|
||||||
|
#include "pidatatransfer.h"
|
||||||
#include "piiostring.h"
|
#include "piiostring.h"
|
||||||
#include "piiobytearray.h"
|
#include "piiobytearray.h"
|
||||||
#include "pitransparentdevice.h"
|
#include "pitransparentdevice.h"
|
||||||
#include "pipeer.h"
|
#include "pipeer.h"
|
||||||
#include "pipacketextractor.h"
|
#include "pipacketextractor.h"
|
||||||
#include "piprotocol.h"
|
|
||||||
#include "piconnection.h"
|
#include "piconnection.h"
|
||||||
#include "pisharedmemory.h"
|
#include "pisharedmemory.h"
|
||||||
|
#include "pispi.h"
|
||||||
|
|
||||||
#endif // PIIOMODULE_H
|
#endif // PIIOMODULE_H
|
||||||
|
|||||||
Reference in New Issue
Block a user