minetest.git - modified minetest for gpcfs purposes

diff options

author	Loic Blot <loic.blot@unix-experience.fr>	2018-03-23 22:12:42 +0100
committer	Loic Blot <loic.blot@unix-experience.fr>	2018-03-23 22:12:48 +0100
commit	eab652fd52b7b806b9414a26a0bf5348df4282f6 (patch)
tree	38395781f2e1dffd100ac971843b52556fa0ee94 /src/irr_aabb3d.h
parent	9293d8e2715f3e883fee4c0ed617636a785f20d1 (diff)
download	minetest-eab652fd52b7b806b9414a26a0bf5348df4282f6.tar.gz minetest-eab652fd52b7b806b9414a26a0bf5348df4282f6.tar.bz2 minetest-eab652fd52b7b806b9414a26a0bf5348df4282f6.zip

Fix some gcc 7.3 reported warnings

``` src/client/joystick_controller.h:85:2: warning: duplicate 'virtual' declaration specifier [-Wduplicate-decl-specifier] virtual bool isTriggered(const irr::SEvent::SJoystickEvent &ev) const; /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/ext/new_allocator.h:140:22: warning: destructor called on non-final 'JoystickAxisCmb' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor] destroy(_Up* __p) { __p->~_Up(); } /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/7.3.1/../../../../include/c++/7.3.1/ext/new_allocator.h:140:22: warning: destructor called on non-final 'JoystickButtonCmb' that has virtual functions but non-virtual destructor [-Wdelete-non-virtual-dtor] destroy(_Up* __p) { __p->~_Up(); } ```

Diffstat (limited to 'src/irr_aabb3d.h')

0 files changed, 0 insertions, 0 deletions

/* Minetest Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com> This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #ifndef UTIL_THREAD_HEADER #define UTIL_THREAD_HEADER #include "../irrlichttypes.h" #include "../threading/thread.h" #include "../threading/mutex.h" #include "../threading/mutex_auto_lock.h" #include "porting.h" #include "log.h" template<typename T> class MutexedVariable { public: MutexedVariable(T value): m_value(value) {} T get() { MutexAutoLock lock(m_mutex); return m_value; } void set(T value) { MutexAutoLock lock(m_mutex); m_value = value; } // You'll want to grab this in a SharedPtr MutexAutoLock *getLock() { return new MutexAutoLock(m_mutex); } // You pretty surely want to grab the lock when accessing this T m_value; private: Mutex m_mutex; }; /* A single worker thread - multiple client threads queue framework. */ template<typename Key, typename T, typename Caller, typename CallerData> class GetResult { public: Key key; T item; std::pair<Caller, CallerData> caller; }; template<typename Key, typename T, typename Caller, typename CallerData> class ResultQueue : public MutexedQueue<GetResult<Key, T, Caller, CallerData> > { }; template<typename Caller, typename Data, typename Key, typename T> class CallerInfo { public: Caller caller; Data data; ResultQueue<Key, T, Caller, Data> *dest; }; template<typename Key, typename T, typename Caller, typename CallerData> class GetRequest { public: GetRequest() {} ~GetRequest() {} GetRequest(Key a_key) { key = a_key; } Key key; std::list<CallerInfo<Caller, CallerData, Key, T> > callers; }; /** * Notes for RequestQueue usage * @param Key unique key to identify a request for a specific resource * @param T ? * @param Caller unique id of calling thread * @param CallerData data passed back to caller */ template<typename Key, typename T, typename Caller, typename CallerData> class RequestQueue { public: bool empty() { return m_queue.empty(); } void add(Key key, Caller caller, CallerData callerdata, ResultQueue<Key, T, Caller, CallerData> *dest) { typename std::deque<GetRequest<Key, T, Caller, CallerData> >::iterator i; typename std::list<CallerInfo<Caller, CallerData, Key, T> >::iterator j; { MutexAutoLock lock(m_queue.getMutex()); /* If the caller is already on the list, only update CallerData */ for (i = m_queue.getQueue().begin(); i != m_queue.getQueue().end(); ++i) { GetRequest<Key, T, Caller, CallerData> &request = *i; if (request.key != key) continue; for (j = request.callers.begin(); j != request.callers.end(); ++j) { CallerInfo<Caller, CallerData, Key, T> &ca = *j; if (ca.caller == caller) { ca.data = callerdata; return; } } CallerInfo<Caller, CallerData, Key, T> ca; ca.caller = caller; ca.data = callerdata; ca.dest = dest; request.callers.push_back(ca); return; } } /* Else add a new request to the queue */ GetRequest<Key, T, Caller, CallerData> request; request.key = key; CallerInfo<Caller, CallerData, Key, T> ca; ca.caller = caller; ca.data = callerdata; ca.dest = dest; request.callers.push_back(ca); m_queue.push_back(request); } GetRequest<Key, T, Caller, CallerData> pop(unsigned int timeout_ms) { return m_queue.pop_front(timeout_ms); } GetRequest<Key, T, Caller, CallerData> pop() { return m_queue.pop_frontNoEx(); } void pushResult(GetRequest<Key, T, Caller, CallerData> req, T res) { for (typename std::list<CallerInfo<Caller, CallerData, Key, T> >::iterator i = req.callers.begin(); i != req.callers.end(); ++i) { CallerInfo<Caller, CallerData, Key, T> &ca = *i; GetResult<Key,T,Caller,CallerData> result; result.key = req.key; result.item = res; result.caller.first = ca.caller; result.caller.second = ca.data;


context:
space:
mode: