diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
tree | c1d4adcda7f0b767537620aea02633158e17218a /community-testing/performous/fix-boost-1.50-xtime.patch | |
parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community-testing/performous/fix-boost-1.50-xtime.patch')
-rw-r--r-- | community-testing/performous/fix-boost-1.50-xtime.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/community-testing/performous/fix-boost-1.50-xtime.patch b/community-testing/performous/fix-boost-1.50-xtime.patch deleted file mode 100644 index d13b18c26..000000000 --- a/community-testing/performous/fix-boost-1.50-xtime.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com> -Date: Sat, 7 Jul 2012 18:53:56 -0300 -Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version) - ---- - game/xtime.hh | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/game/xtime.hh b/game/xtime.hh -index 41303cb..8f5463d 100644 ---- a/game/xtime.hh -+++ b/game/xtime.hh -@@ -1,5 +1,6 @@ - #pragma once - -+#include <boost/version.hpp> - #include <boost/thread/xtime.hpp> - #include <cmath> - -@@ -20,7 +21,11 @@ namespace { - } - boost::xtime now() { - boost::xtime time; -+#if (BOOST_VERSION / 100 % 1000 >= 50) -+ boost::xtime_get(&time, boost::TIME_UTC_); -+#else - boost::xtime_get(&time, boost::TIME_UTC); -+#endif - return time; - } - double seconds(boost::xtime const& time) { --- -1.7.4.1 - |