Travis: Update clang from 4.0 to 5.0 (#6467)

* Update clang from 4.0 to 5.0
This commit is contained in:
Loïc Blot 2017-10-09 11:32:06 +02:00 committed by GitHub
parent e6e5fa3bf8
commit 17016090e3
12 changed files with 55 additions and 37 deletions

@ -17,7 +17,7 @@ AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: false IndentCaseLabels: false
AccessModifierOffset: -8 AccessModifierOffset: -8
ColumnLimit: 90 ColumnLimit: 90
AllowShortFunctionsOnASingleLine: Inline AllowShortFunctionsOnASingleLine: InlineOnly
SortIncludes: false SortIncludes: false
IncludeCategories: IncludeCategories:
- Regex: '^".*' - Regex: '^".*'
@ -26,3 +26,5 @@ IncludeCategories:
Priority: 1 Priority: 1
AlignAfterOpenBracket: DontAlign AlignAfterOpenBracket: DontAlign
ContinuationIndentWidth: 16 ContinuationIndentWidth: 16
ConstructorInitializerIndentWidth: 16
BreakConstructorInitializers: AfterColon

@ -61,32 +61,32 @@ matrix:
sources: &sources sources: &sources
- llvm-toolchain-trusty-3.6 - llvm-toolchain-trusty-3.6
- env: PLATFORM=Unix COMPILER=clang-4.0 - env: PLATFORM=Unix COMPILER=clang-5.0
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['clang-4.0', 'clang++-4.0'] packages: ['clang-5.0', 'clang++-5.0']
sources: &sources sources: &sources
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-5.0
- env: PLATFORM=Unix COMPILER=clang-4.0 VALGRIND=1 - env: PLATFORM=Unix COMPILER=clang-5.0 VALGRIND=1
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['valgrind', 'clang-4.0', 'clang++-4.0'] packages: ['valgrind', 'clang-5.0', 'clang++-5.0']
sources: &sources sources: &sources
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-5.0
- env: LINT=1 - env: LINT=1
compiler: clang compiler: clang
os: linux os: linux
addons: addons:
apt: apt:
packages: ['clang-format-4.0'] packages: ['clang-format-5.0']
sources: &sources sources: &sources
- llvm-toolchain-trusty-4.0 - llvm-toolchain-trusty-5.0

@ -36,8 +36,9 @@ struct ChatMessage
ChatMessage(const std::wstring &m = L"") : message(m) {} ChatMessage(const std::wstring &m = L"") : message(m) {}
ChatMessage(ChatMessageType t, const std::wstring &m, const std::wstring &s = L"", ChatMessage(ChatMessageType t, const std::wstring &m, const std::wstring &s = L"",
std::time_t ts = std::time(0)) std::time_t ts = std::time(0)) :
: type(t), message(m), sender(s), timestamp(ts) type(t),
message(m), sender(s), timestamp(ts)
{ {
} }

@ -93,10 +93,11 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu"); params.HighPrecisionFPU = g_settings->getBool("high_precision_fpu");
params.ZBufferBits = 24; params.ZBufferBits = 24;
#ifdef __ANDROID__ #ifdef __ANDROID__
// clang-format off
params.PrivateData = porting::app_global; params.PrivateData = porting::app_global;
params.OGLES2ShaderPath = std::string( params.OGLES2ShaderPath = std::string(porting::path_user + DIR_DELIM + "media" +
porting::path_user + DIR_DELIM + "media" + DIR_DELIM + "Shaders" + DIR_DELIM + "Shaders" + DIR_DELIM).c_str();
DIR_DELIM).c_str(); // clang-format on
#endif #endif
m_device = createDeviceEx(params); m_device = createDeviceEx(params);
@ -233,7 +234,7 @@ bool RenderingEngine::setWindowIcon()
const HICON hicon = LoadIcon(GetModuleHandle(NULL), const HICON hicon = LoadIcon(GetModuleHandle(NULL),
MAKEINTRESOURCE(130) // The ID of the ICON defined in MAKEINTRESOURCE(130) // The ID of the ICON defined in
// winresource.rc // winresource.rc
); );
if (hicon) { if (hicon) {
SendMessage(hWnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hicon)); SendMessage(hWnd, WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(hicon));
@ -997,8 +998,14 @@ void RenderingEngine::draw_plain(Camera *camera, bool show_hud, Hud *hud,
const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type) const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type)
{ {
static const char *driver_ids[] = { static const char *driver_ids[] = {
"null", "software", "burningsvideo", "direct3d8", "direct3d9", "null",
"opengl", "ogles1", "ogles2", "software",
"burningsvideo",
"direct3d8",
"direct3d9",
"opengl",
"ogles1",
"ogles2",
}; };
return driver_ids[type]; return driver_ids[type];
@ -1007,8 +1014,14 @@ const char *RenderingEngine::getVideoDriverName(irr::video::E_DRIVER_TYPE type)
const char *RenderingEngine::getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type) const char *RenderingEngine::getVideoDriverFriendlyName(irr::video::E_DRIVER_TYPE type)
{ {
static const char *driver_names[] = { static const char *driver_names[] = {
"NULL Driver", "Software Renderer", "Burning's Video", "NULL Driver",
"Direct3D 8", "Direct3D 9", "OpenGL", "OpenGL ES1", "OpenGL ES2", "Software Renderer",
"Burning's Video",
"Direct3D 8",
"Direct3D 9",
"OpenGL",
"OpenGL ES1",
"OpenGL ES2",
}; };
return driver_names[type]; return driver_names[type];

@ -106,7 +106,7 @@ protected:
/* /*
* Below: values managed by m_time_lock * Below: values managed by m_time_lock
*/ */
// Time of day in milli-hours (0-23999), determines day and night // Time of day in milli-hours (0-23999), determines day and night
u32 m_time_of_day; u32 m_time_of_day;
// Time of day in 0...1 // Time of day in 0...1
@ -122,7 +122,7 @@ protected:
std::atomic<u32> m_day_count; std::atomic<u32> m_day_count;
/* /*
* Above: values managed by m_time_lock * Above: values managed by m_time_lock
*/ */
/* TODO: Add a callback function so these can be updated when a setting /* TODO: Add a callback function so these can be updated when a setting
* changes. At this point in time it doesn't matter (e.g. /set * changes. At this point in time it doesn't matter (e.g. /set

@ -78,8 +78,8 @@ struct HTTPFetchResult
HTTPFetchResult() = default; HTTPFetchResult() = default;
HTTPFetchResult(const HTTPFetchRequest &fetch_request) HTTPFetchResult(const HTTPFetchRequest &fetch_request) :
: caller(fetch_request.caller), request_id(fetch_request.request_id) caller(fetch_request.caller), request_id(fetch_request.request_id)
{ {
} }
}; };

@ -63,8 +63,8 @@ enum PeerChangeType : u8
struct PeerChange struct PeerChange
{ {
PeerChange(PeerChangeType t, session_t _peer_id, bool _timeout) PeerChange(PeerChangeType t, session_t _peer_id, bool _timeout) :
: type(t), peer_id(_peer_id), timeout(_timeout) type(t), peer_id(_peer_id), timeout(_timeout)
{ {
} }
PeerChange() = delete; PeerChange() = delete;

@ -22,8 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
static Profiler main_profiler; static Profiler main_profiler;
Profiler *g_profiler = &main_profiler; Profiler *g_profiler = &main_profiler;
ScopeProfiler::ScopeProfiler( ScopeProfiler::ScopeProfiler(
Profiler *profiler, const std::string &name, ScopeProfilerType type) Profiler *profiler, const std::string &name, ScopeProfilerType type) :
: m_profiler(profiler), m_name(name), m_type(type) m_profiler(profiler),
m_name(name), m_type(type)
{ {
if (m_profiler) if (m_profiler)
m_timer = new TimeTaker(m_name); m_timer = new TimeTaker(m_name);

@ -34,8 +34,9 @@ public:
struct SimpleSoundSpec struct SimpleSoundSpec
{ {
SimpleSoundSpec(const std::string &name = "", float gain = 1.0f, SimpleSoundSpec(const std::string &name = "", float gain = 1.0f,
float fade = 0.0f, float pitch = 1.0f) float fade = 0.0f, float pitch = 1.0f) :
: name(name), gain(gain), fade(fade), pitch(pitch) name(name),
gain(gain), fade(fade), pitch(pitch)
{ {
} }

@ -46,8 +46,8 @@ struct ItemPartColor
ItemPartColor() = default; ItemPartColor() = default;
ItemPartColor(bool override, video::SColor color) ItemPartColor(bool override, video::SColor color) :
: override_base(override), color(color) override_base(override), color(color)
{ {
} }
}; };

@ -13,9 +13,9 @@ set_linux_compiler_env() {
elif [[ "${COMPILER}" == "clang-3.6" ]]; then elif [[ "${COMPILER}" == "clang-3.6" ]]; then
export CC=clang-3.6 export CC=clang-3.6
export CXX=clang++-3.6 export CXX=clang++-3.6
elif [[ "${COMPILER}" == "clang-4.0" ]]; then elif [[ "${COMPILER}" == "clang-5.0" ]]; then
export CC=clang-4.0 export CC=clang-5.0
export CXX=clang++-4.0 export CXX=clang++-5.0
fi fi
} }
@ -45,7 +45,7 @@ TRIGGER_COMPILE_PATHS="src/.*\.(c|cpp|h)|CMakeLists.txt|cmake/Modules/|util/trav
needs_compile() { needs_compile() {
RANGE="$TRAVIS_COMMIT_RANGE" RANGE="$TRAVIS_COMMIT_RANGE"
if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then if [[ "$(git diff --name-only $RANGE -- 2>/dev/null)" == "" ]]; then
RANGE="$TRAVIS_COMMIT^...$TRAVIS_COMMIT" RANGE="$TRAVIS_COMMIT^...$TRAVIS_COMMIT"
echo "Fixed range: $RANGE" echo "Fixed range: $RANGE"
fi fi

@ -1,8 +1,8 @@
#! /bin/bash #! /bin/bash
function perform_lint() { function perform_lint() {
echo "Performing LINT..." echo "Performing LINT..."
if hash clang-format-4.0 2>/dev/null; then if hash clang-format-5.0 2>/dev/null; then
CLANG_FORMAT=clang-format-4.0 CLANG_FORMAT=clang-format-5.0
else else
CLANG_FORMAT=clang-format CLANG_FORMAT=clang-format
fi fi