diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-05-09 13:40:36 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-05-09 13:40:36 (GMT) |
| commit | 57ef51ac1d1917f46cd36a9f75aa81bc9c4d086d (patch) | |
| tree | 57472016d1db65d18511ebe38ae5a187434a3d0a | |
| parent | 1044fcc0598ae428f8e5c4cd25600fcee84158bd (diff) | |
| parent | e2541039477d00cbbfe5507d682796755438eaaf (diff) | |
| download | Doxygen-57ef51ac1d1917f46cd36a9f75aa81bc9c4d086d.zip Doxygen-57ef51ac1d1917f46cd36a9f75aa81bc9c4d086d.tar.gz Doxygen-57ef51ac1d1917f46cd36a9f75aa81bc9c4d086d.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/commentscan.l | 1 | ||||
| -rw-r--r-- | src/sqlite3gen.cpp | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index adf7e1b..23a0471 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -2120,7 +2120,6 @@ static bool handleMainpage(yyscan_t yyscanner,const QCString &, const StringVect { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; bool stop=makeStructuralIndicator(yyscanner,Entry::MAINPAGEDOC_SEC); - yyextra->current->name = ""; if (!stop) { yyextra->current->name = "mainpage"; diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index 6943fb9..8b9ed94 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -175,6 +175,7 @@ const char * table_schema[][2] = { "\twrite TEXT,\n" "\tprot INTEGER DEFAULT 0, -- 0:public 1:protected 2:private 3:package\n" "\tstatic INTEGER DEFAULT 0, -- 0:no 1:yes\n" + "\textern INTEGER DEFAULT 0, -- 0:no 1:yes\n" "\tconst INTEGER DEFAULT 0, -- 0:no 1:yes\n" "\texplicit INTEGER DEFAULT 0, -- 0:no 1:yes\n" "\tinline INTEGER DEFAULT 0, -- 0:no 1:yes 2:both (set after encountering inline and not-inline)\n" @@ -608,6 +609,7 @@ SqlStmt memberdef_insert={ "write," "prot," "static," + "extern," "const," "explicit," "inline," @@ -666,6 +668,7 @@ SqlStmt memberdef_insert={ ":write," ":prot," ":static," + ":extern," ":const," ":explicit," ":inline," @@ -925,7 +928,7 @@ static int insertPath(QCString name, bool local=TRUE, bool found=TRUE, int type= static void recordMetadata() { bindTextParameter(meta_insert,":doxygen_version",getFullVersion()); - bindTextParameter(meta_insert,":schema_version","0.2.0",TRUE); //TODO: this should be a constant somewhere; not sure where + bindTextParameter(meta_insert,":schema_version","0.2.1",TRUE); //TODO: this should be a constant somewhere; not sure where bindTextParameter(meta_insert,":generated_at",dateToString(TRUE)); bindTextParameter(meta_insert,":generated_on",dateToString(FALSE)); bindTextParameter(meta_insert,":project_name",Config_getString(PROJECT_NAME)); @@ -1147,7 +1150,7 @@ static int prepareStatement(sqlite3 *db, SqlStmt &s) rc = sqlite3_prepare_v2(db,s.query,-1,&s.stmt,0); if (rc!=SQLITE_OK) { - err("prepare failed for %s\n%s\n", s.query, sqlite3_errmsg(db)); + err("prepare failed for:\n %s\n %s\n", s.query, sqlite3_errmsg(db)); s.db = NULL; return -1; } @@ -1612,6 +1615,7 @@ static void generateSqlite3ForMember(const MemberDef *md, struct Refid scope_ref bindIntParameter(memberdef_insert,":prot",md->protection()); bindIntParameter(memberdef_insert,":static",md->isStatic()); + bindIntParameter(memberdef_insert,":extern",md->isExternal()); bool isFunc=FALSE; switch (md->memberType()) @@ -2496,7 +2500,7 @@ void generateSqlite3() if ( -1 == prepareStatements(db) ) { - err("sqlite generator: prepareStatements failed!"); + err("sqlite generator: prepareStatements failed!\n"); return; } @@ -2579,7 +2583,7 @@ void generateSqlite3() #else // USE_SQLITE3 void generateSqlite3() { - err("sqlite3 support has not been compiled in!"); + err("sqlite3 support has not been compiled in!\n"); } #endif // vim: noai:ts=2:sw=2:ss=2:expandtab |