phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes build error 'no viable conversion' on OS X with clang, libc++ and c++11, refs #2462.

Browse Source 
Removes explicit use of _Unwrap(), prefer deference operator * instead

This was SVN commit r16157.
This commit is contained in:
historic_bruno 2015-01-18 06:36:15 +00:00
parent 8976fb7646
commit 840c8215b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2014 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -103,7 +103,7 @@ void SetSettings(const sEnvironmentSettings& s)
wm->m_Waviness = s.waterwaviness;
wm->m_Murkiness = s.watermurkiness;
wm->m_WindAngle = s.windangle;
wm->m_WaterType = s.watertype._Unwrap();
wm->m_WaterType = *s.watertype;
#define COLOUR(A, B) B = CColor(A->r/255.f, A->g/255.f, A->b/255.f, 1.f)
COLOUR(s.watercolour, wm->m_WaterColor);

4
source/tools/atlas/GameInterface/Shareable.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2012 Wildfire Games.
/* Copyright (C) 2015 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@ -110,7 +110,7 @@ SHAREABLE_PRIMITIVE(void*);
Shareable() {} \
Shareable(T const& rhs) { m = rhs; } \
const T* operator->() const { return &m; } \
operator const T() const { return m; } \
operator T() const { return m; } \
const T _Unwrap() const { return m; } \
}