Fix a number of potential or actual static object initialization issues
This commit is contained in:
parent
2f6328fb47
commit
32f4f7b6fc
@ -41,8 +41,6 @@ using std::set;
|
||||
#include "cancelcheck.h"
|
||||
#include "unacpp.h"
|
||||
|
||||
const string PlainToRich::snull = "";
|
||||
|
||||
// For debug printing
|
||||
static string vecStringToString(const vector<string>& t)
|
||||
{
|
||||
|
||||
@ -86,7 +86,7 @@ public:
|
||||
virtual string startChunk() {return snull;}
|
||||
|
||||
protected:
|
||||
static const string snull;
|
||||
const string snull;
|
||||
bool m_inputhtml;
|
||||
// Use <br> to break plain text lines (else caller has used a <pre> tag)
|
||||
bool m_eolbr;
|
||||
|
||||
@ -114,20 +114,5 @@ class Db::Native {
|
||||
|
||||
};
|
||||
|
||||
// Field names inside the index data record may differ from the rcldoc ones
|
||||
// (esp.: caption / title)
|
||||
inline const string& docfToDatf(const string& df)
|
||||
{
|
||||
static const string keycap("caption");
|
||||
static const string keydmtime("dmtime");
|
||||
if (!df.compare(Doc::keytt)) {
|
||||
return keycap;
|
||||
} else if (!df.compare(Doc::keymt)) {
|
||||
return keydmtime;
|
||||
} else {
|
||||
return df;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endif /* _rcldb_p_h_included_ */
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user