Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / libs / generic / bitfield.h

diff --git a/libs/generic/bitfield.h b/libs/generic/bitfield.h
index 652f0539c25c20a2d5d249d25c4c85cfa4a8c44d..f9427aace30e50d87d28b11550283d9056819592 100644 (file)
--- a/libs/generic/bitfield.h
+++ b/libs/generic/bitfield.h
@@ -1,25 +1,25 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant 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 General Public License for more details.
+   GtkRadiant 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 General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#if !defined(INCLUDED_GENERIC_BITFIELD_H)
+#if !defined( INCLUDED_GENERIC_BITFIELD_H )
 #define INCLUDED_GENERIC_BITFIELD_H
 
 /// \file
@@ -35,99 +35,81 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 template<typename Enumeration>
 class BitFieldValue : public Enumeration
 {
-  unsigned m_value;
+unsigned m_value;
 protected:
-  explicit BitFieldValue(unsigned value) : m_value(value)
-  {
-  }
+explicit BitFieldValue( unsigned value ) : m_value( value ){
+}
 public:
-  BitFieldValue() : m_value(0)
-  {
-  }
-  explicit BitFieldValue(typename Enumeration::Value value) : m_value(1 << value)
-  {
-  }
-  unsigned get() const
-  {
-    return m_value;
-  }
+BitFieldValue() : m_value( 0 ){
+}
+explicit BitFieldValue( typename Enumeration::Value value ) : m_value( 1 << value ){
+}
+unsigned get() const {
+       return m_value;
+}
 };
 
 template<typename Enumeration>
 class BitFieldValueUnsafe : public BitFieldValue<Enumeration>
 {
 public:
-  explicit BitFieldValueUnsafe(unsigned value) : BitFieldValue<Enumeration>(value)
-  {
-  }
+explicit BitFieldValueUnsafe( unsigned value ) : BitFieldValue<Enumeration>( value ){
+}
 };
 
 template<typename Enumeration>
-inline bool operator==(BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other)
-{
-  return self.get() == other.get();
+inline bool operator==( BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other ){
+       return self.get() == other.get();
 }
 template<typename Enumeration>
-inline bool operator!=(BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other)
-{
-  return !operator==(self, other);
+inline bool operator!=( BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other ){
+       return !operator==( self, other );
 }
 
 template<typename Enumeration>
-inline BitFieldValue<Enumeration> operator|(BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other)
-{
-  return BitFieldValueUnsafe<Enumeration>(self.get() | other.get());
+inline BitFieldValue<Enumeration> operator|( BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other ){
+       return BitFieldValueUnsafe<Enumeration>( self.get() | other.get() );
 }
 template<typename Enumeration>
-inline BitFieldValue<Enumeration>& operator|=(BitFieldValue<Enumeration>& self, BitFieldValue<Enumeration> other)
-{
-  return self = self | other;
+inline BitFieldValue<Enumeration>& operator|=( BitFieldValue<Enumeration>& self, BitFieldValue<Enumeration> other ){
+       return self = self | other;
 }
 template<typename Enumeration>
-inline BitFieldValue<Enumeration> operator&(BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other)
-{
-  return BitFieldValueUnsafe<Enumeration>(self.get() & other.get());
+inline BitFieldValue<Enumeration> operator&( BitFieldValue<Enumeration> self, BitFieldValue<Enumeration> other ){
+       return BitFieldValueUnsafe<Enumeration>( self.get() & other.get() );
 }
 template<typename Enumeration>
-inline BitFieldValue<Enumeration>& operator&=(BitFieldValue<Enumeration>& self, BitFieldValue<Enumeration> other)
-{
-  return self = self & other;
+inline BitFieldValue<Enumeration>& operator&=( BitFieldValue<Enumeration>& self, BitFieldValue<Enumeration> other ){
+       return self = self & other;
 }
 template<typename Enumeration>
-inline BitFieldValue<Enumeration> operator~(BitFieldValue<Enumeration> self)
-{
-  return BitFieldValueUnsafe<Enumeration>(~self.get());
+inline BitFieldValue<Enumeration> operator~( BitFieldValue<Enumeration> self ){
+       return BitFieldValueUnsafe<Enumeration>( ~self.get() );
 }
 
 
 
-inline unsigned int bitfield_enable(unsigned int bitfield, unsigned int mask)
-{
-  return bitfield | mask;
+inline unsigned int bitfield_enable( unsigned int bitfield, unsigned int mask ){
+       return bitfield | mask;
 }
-inline unsigned int bitfield_disable(unsigned int bitfield, unsigned int mask)
-{
-  return bitfield & ~mask;
+inline unsigned int bitfield_disable( unsigned int bitfield, unsigned int mask ){
+       return bitfield & ~mask;
 }
-inline bool bitfield_enabled(unsigned int bitfield, unsigned int mask)
-{
-  return (bitfield & mask) != 0;
+inline bool bitfield_enabled( unsigned int bitfield, unsigned int mask ){
+       return ( bitfield & mask ) != 0;
 }
 
 template<typename Enumeration>
-inline BitFieldValue<Enumeration> bitfield_enable(BitFieldValue<Enumeration> bitfield, BitFieldValue<Enumeration> mask)
-{
-  return bitfield | mask;
+inline BitFieldValue<Enumeration> bitfield_enable( BitFieldValue<Enumeration> bitfield, BitFieldValue<Enumeration> mask ){
+       return bitfield | mask;
 }
 template<typename Enumeration>
-inline BitFieldValue<Enumeration> bitfield_disable(BitFieldValue<Enumeration> bitfield, BitFieldValue<Enumeration> mask)
-{
-  return bitfield & ~mask;
+inline BitFieldValue<Enumeration> bitfield_disable( BitFieldValue<Enumeration> bitfield, BitFieldValue<Enumeration> mask ){
+       return bitfield & ~mask;
 }
 template<typename Enumeration>
-inline bool bitfield_enabled(BitFieldValue<Enumeration> bitfield, BitFieldValue<Enumeration> mask)
-{
-  return (bitfield & mask).get() != 0;
+inline bool bitfield_enabled( BitFieldValue<Enumeration> bitfield, BitFieldValue<Enumeration> mask ){
+       return ( bitfield & mask ).get() != 0;
 }
 
 #endif