aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2017-05-26 17:03:46 +0200
committerLoïc Blot <nerzhul@users.noreply.github.com>2017-06-04 09:57:08 +0200
commitbf6569b57019d070246d947ed929cb2b5eb67faf (patch)
tree3a8a3d4858f20a57930e0a0d0ad1f7c3fb48b512 /src
parent0e58168fe5bce607f64805b854420e7558372f24 (diff)
downloadminetest-bf6569b57019d070246d947ed929cb2b5eb67faf.tar.gz
minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.tar.bz2
minetest-bf6569b57019d070246d947ed929cb2b5eb67faf.zip
Minetest for C++11 (CMakeLists + Travis)
* Move GCC to GCC 6 & GCC 7 * Move Clang to Clang 3.6 & Clang 4.0 * LINT moves from Clang 3.9 to Clang 4.0 * Move XCode 7.3 to 8.0 * Use more travis tricks to install compilers instead of adding complexity to our build script * Clang format fixes on checked files (compat Cpp11 instead of Cpp03) * Mingw GCC update from 4.8.4 to 5.3 (Ubuntu Xenial) * Drop mingw cmake generated files and add them to gitignore
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt5
-rw-r--r--src/database-dummy.h1
-rw-r--r--src/database-leveldb.h1
-rw-r--r--src/environment.h1
-rw-r--r--src/nameidmapping.h1
-rw-r--r--src/script/lua_api/l_metadata.h1
-rw-r--r--src/touchscreengui.h2
7 files changed, 9 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c1a4eee0..6963d0306 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -708,7 +708,7 @@ include(CheckCXXCompilerFlag)
if(MSVC)
# Visual Studio
-
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++11")
# EHa enables SEH exceptions (used for catching segfaults)
set(CMAKE_CXX_FLAGS_RELEASE "/EHa /Ox /GL /FD /MT /GS- /Zi /arch:SSE /fp:fast /D NDEBUG /D _HAS_ITERATOR_DEBUGGING=0 /TP")
#set(CMAKE_EXE_LINKER_FLAGS_RELEASE "/LTCG /NODEFAULTLIB:\"libcmtd.lib\" /NODEFAULTLIB:\"libcmt.lib\"")
@@ -728,9 +728,10 @@ if(MSVC)
# /MT = Link statically with standard library stuff
set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT")
else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# Probably GCC
if(APPLE)
- SET( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
+ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pagezero_size 10000 -image_base 100000000" )
endif()
if(WARN_ALL)
set(RELEASE_WARNING_FLAGS "-Wall")
diff --git a/src/database-dummy.h b/src/database-dummy.h
index 7d1cb2279..c4060d5f1 100644
--- a/src/database-dummy.h
+++ b/src/database-dummy.h
@@ -40,6 +40,7 @@ public:
void beginSave() {}
void endSave() {}
+
private:
std::map<s64, std::string> m_database;
};
diff --git a/src/database-leveldb.h b/src/database-leveldb.h
index 52ccebe70..1a51f98b6 100644
--- a/src/database-leveldb.h
+++ b/src/database-leveldb.h
@@ -41,6 +41,7 @@ public:
void beginSave() {}
void endSave() {}
+
private:
leveldb::DB *m_database;
};
diff --git a/src/environment.h b/src/environment.h
index 1de13e9ed..5a40ff31a 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -79,6 +79,7 @@ public:
u32 m_added_objects;
IGameDef *getGameDef() { return m_gamedef; }
+
protected:
GenericAtomic<float> m_time_of_day_speed;
diff --git a/src/nameidmapping.h b/src/nameidmapping.h
index a2f3a3062..be353327d 100644
--- a/src/nameidmapping.h
+++ b/src/nameidmapping.h
@@ -80,6 +80,7 @@ public:
return true;
}
u16 size() const { return m_id_to_name.size(); }
+
private:
UNORDERED_MAP<u16, std::string> m_id_to_name;
UNORDERED_MAP<std::string, u16> m_name_to_id;
diff --git a/src/script/lua_api/l_metadata.h b/src/script/lua_api/l_metadata.h
index a4d8214d3..a479e64b0 100644
--- a/src/script/lua_api/l_metadata.h
+++ b/src/script/lua_api/l_metadata.h
@@ -32,6 +32,7 @@ class MetaDataRef : public ModApiBase
{
public:
virtual ~MetaDataRef() {}
+
protected:
static MetaDataRef *checkobject(lua_State *L, int narg);
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index f4f1766c9..a8c59fa9a 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -172,7 +172,7 @@ private:
IEventReceiver *m_receiver;
ISimpleTextureSource *m_texturesource;
v2u32 m_screensize;
- std::map<int, rect<s32> > m_hud_rects;
+ std::map<int, rect<s32>> m_hud_rects;
std::map<int, irr::EKEY_CODE> m_hud_ids;
bool m_visible; // is the gui visible