summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-04-23 16:22:53 +0200
committerLoic Blot <loic.blot@unix-experience.fr>2017-04-23 16:22:53 +0200
commitd7ddceac730393e7a66980ad21630a05b7e291c4 (patch)
tree41f3321463e64351531928c35b38cc795777c991
parent29ab20c27229672c24a7699afbcd54caad903331 (diff)
downloadminetest-d7ddceac730393e7a66980ad21630a05b7e291c4.tar.gz
minetest-d7ddceac730393e7a66980ad21630a05b7e291c4.tar.bz2
minetest-d7ddceac730393e7a66980ad21630a05b7e291c4.zip
Fix lint since recent player to db merge
-rw-r--r--src/database-files.cpp4
-rw-r--r--src/database-files.h4
-rw-r--r--src/remoteplayer.h1
-rw-r--r--util/travis/clang-format-whitelist.txt2
4 files changed, 7 insertions, 4 deletions
diff --git a/src/database-files.cpp b/src/database-files.cpp
index 08a1f2d03..3b130f91b 100644
--- a/src/database-files.cpp
+++ b/src/database-files.cpp
@@ -27,8 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "filesys.h"
// !!! WARNING !!!
-// This backend is intended to be used on Minetest 0.4.16 only for the transition backend for
-// player files
+// This backend is intended to be used on Minetest 0.4.16 only for the transition backend
+// for player files
void PlayerDatabaseFiles::serialize(std::ostringstream &os, RemotePlayer *player)
{
diff --git a/src/database-files.h b/src/database-files.h
index d23069c2a..888362249 100644
--- a/src/database-files.h
+++ b/src/database-files.h
@@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define DATABASE_FILES_HEADER
// !!! WARNING !!!
-// This backend is intended to be used on Minetest 0.4.16 only for the transition backend for
-// player files
+// This backend is intended to be used on Minetest 0.4.16 only for the transition backend
+// for player files
#include "database.h"
diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index ce7db5608..4b96835fc 100644
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -38,6 +38,7 @@ enum RemotePlayerChatResult
class RemotePlayer : public Player
{
friend class PlayerDatabaseFiles;
+
public:
RemotePlayer(const char *name, IItemDefManager *idef);
virtual ~RemotePlayer() {}
diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index e9ff56cf5..9f5612b78 100644
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -51,11 +51,13 @@ src/craftdef.cpp
src/craftdef.h
src/database.cpp
src/database-dummy.cpp
+src/database-files.cpp
src/database-leveldb.cpp
src/database-postgresql.cpp
src/database-postgresql.h
src/database-redis.cpp
src/database-sqlite3.cpp
+src/database-sqlite3.h
src/daynightratio.h
src/debug.cpp
src/debug.h