nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

fixed: move to util namespace

Browse Source
This commit is contained in:
Danny Robson 2014-12-05 13:20:05 +11:00
parent a340473502
commit c2d608410b
2 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fixed.cpp
View File

@ -14,13 +14,15 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libgim. If not, see <http://www.gnu.org/licenses/>. * along with libgim. If not, see <http://www.gnu.org/licenses/>.
* *
* Copyright 2011 Danny Robson <danny@nerdcruft.net> * Copyright 2011, 2014 Danny Robson <danny@nerdcruft.net>
*/ */
#include "fixed.hpp" #include "fixed.hpp"
#include <cmath> #include <cmath>
using namespace util;
/* /*
* Constructors * Constructors
*/ */

64
fixed.hpp
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with libgim. If not, see <http://www.gnu.org/licenses/>. * along with libgim. If not, see <http://www.gnu.org/licenses/>.
* *
* Copyright 2011 Danny Robson <danny@nerdcruft.net> * Copyright 2011, 2014 Danny Robson <danny@nerdcruft.net>
*/ */
#ifndef __UTIL_FIXED_HPP #ifndef __UTIL_FIXED_HPP
@ -24,42 +24,44 @@
#include <cstdint> #include <cstdint>
template <unsigned int INT, unsigned int FRAC> namespace util {
class fixed { template <unsigned int INT, unsigned int FRAC>
public: class fixed {
typedef typename bits_type<INT + FRAC>::uint combined_type; public:
typedef typename bits_type<INT + FRAC>::uint integral_type; typedef typename bits_type<INT + FRAC>::uint combined_type;
typedef typename bits_type<INT + FRAC>::uint integral_type;
combined_type m_value; combined_type m_value;
public: public:
explicit fixed(double); explicit fixed(double);
explicit fixed(float); explicit fixed(float);
explicit fixed(integral_type); explicit fixed(integral_type);
double to_double (void) const; double to_double (void) const;
float to_float (void) const; float to_float (void) const;
integral_type to_integral (void) const; integral_type to_integral (void) const;
fixed<INT, FRAC>& operator +=(const fixed<INT, FRAC>); fixed<INT, FRAC>& operator +=(const fixed<INT, FRAC>);
fixed<INT, FRAC>& operator -=(const fixed<INT, FRAC>); fixed<INT, FRAC>& operator -=(const fixed<INT, FRAC>);
fixed<INT, FRAC>& operator *=(const fixed<INT, FRAC>); fixed<INT, FRAC>& operator *=(const fixed<INT, FRAC>);
fixed<INT, FRAC>& operator /=(const fixed<INT, FRAC>); fixed<INT, FRAC>& operator /=(const fixed<INT, FRAC>);
fixed<INT, FRAC> operator +(const fixed<INT, FRAC>) const; fixed<INT, FRAC> operator +(const fixed<INT, FRAC>) const;
fixed<INT, FRAC> operator -(const fixed<INT, FRAC>) const; fixed<INT, FRAC> operator -(const fixed<INT, FRAC>) const;
fixed<INT, FRAC> operator *(const fixed<INT, FRAC>) const; fixed<INT, FRAC> operator *(const fixed<INT, FRAC>) const;
fixed<INT, FRAC> operator /(const fixed<INT, FRAC>) const; fixed<INT, FRAC> operator /(const fixed<INT, FRAC>) const;
fixed<INT, FRAC>& operator +=(integral_type); fixed<INT, FRAC>& operator +=(integral_type);
fixed<INT, FRAC>& operator -=(integral_type); fixed<INT, FRAC>& operator -=(integral_type);
fixed<INT, FRAC>& operator *=(integral_type); fixed<INT, FRAC>& operator *=(integral_type);
fixed<INT, FRAC>& operator /=(integral_type); fixed<INT, FRAC>& operator /=(integral_type);
fixed<INT, FRAC> operator +(integral_type) const; fixed<INT, FRAC> operator +(integral_type) const;
fixed<INT, FRAC> operator -(integral_type) const; fixed<INT, FRAC> operator -(integral_type) const;
fixed<INT, FRAC> operator *(integral_type) const; fixed<INT, FRAC> operator *(integral_type) const;
fixed<INT, FRAC> operator /(integral_type) const; fixed<INT, FRAC> operator /(integral_type) const;
}; };
}
#endif // __UTIL_FIXED_HPP #endif // __UTIL_FIXED_HPP