mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 12:35:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2200 from akortunov/warnfix

Browse Source 
Replace boost GCD by the homebrew implementation
This commit is contained in:
Bret Curtis 2019-03-02 15:36:25 +01:00 committed by GitHub
commit e7bf89d3d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/launcher/graphicspage.cpp
View File

@ -1,11 +1,5 @@
#include "graphicspage.hpp"
#include <boost/version.hpp>
#if BOOST_VERSION >= 106500
#include <boost/integer/common_factor.hpp>
#else
#include <boost/math/common_factor.hpp>
#endif
#include <csignal>
#include <QDesktopWidget>
#include <QMessageBox>
@ -20,14 +14,11 @@
#include <SDL_video.h>
#include <components/files/configurationmanager.hpp>
#include <components/misc/gcd.hpp>
QString getAspect(int x, int y)
{
#if BOOST_VERSION >= 106500
int gcd = boost::integer::gcd (x, y);
#else
int gcd = boost::math::gcd (x, y);
#endif
int gcd = Misc::gcd (x, y);
int xaspect = x / gcd;
int yaspect = y / gcd;
// special case: 8 : 5 is usually referred to as 16:10

12
apps/openmw/mwgui/settingswindow.cpp
View File

@ -8,16 +8,12 @@
#include <MyGUI_TabControl.h>
#include <boost/algorithm/string.hpp>
#if BOOST_VERSION >= 106500
#include <boost/integer/common_factor.hpp>
#else
#include <boost/math/common_factor.hpp>
#endif
#include <SDL_video.h>
#include <components/debug/debuglog.hpp>
#include <components/misc/stringops.hpp>
#include <components/misc/gcd.hpp>
#include <components/widgets/sharedstatebutton.hpp>
#include <components/settings/settings.hpp>
@ -63,11 +59,7 @@ namespace
std::string getAspect (int x, int y)
{
#if BOOST_VERSION >= 106500
int gcd = boost::integer::gcd (x, y);
#else
int gcd = boost::math::gcd (x, y);
#endif
int gcd = Misc::gcd (x, y);
int xaspect = x / gcd;
int yaspect = y / gcd;
// special case: 8 : 5 is usually referred to as 16:10

2
components/CMakeLists.txt
View File

@ -86,7 +86,7 @@ add_component_dir (esmterrain
)
add_component_dir (misc
constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
gcd constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
)
add_component_dir (debug

13
components/misc/gcd.hpp Normal file
View File

@ -0,0 +1,13 @@
#ifndef MISC_GCD_H
#define MISC_GCD_H
namespace Misc
{
// TODO: replace to the std::gcd() when the C++17 will be available.
int gcd(int a, int b)
{
return b == 0 ? a : gcd(b, a % b);
}
}
#endif