Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / lib / general / gr_log2_const.h

diff --git a/gnuradio-core/src/lib/general/gr_log2_const.h b/gnuradio-core/src/lib/general/gr_log2_const.h
index 0c27bbcce18a6a0b580152bdd51087eec28f6250..4ea420920322708a60862de7094775f76f62d270 100644 (file)
--- a/gnuradio-core/src/lib/general/gr_log2_const.h
+++ b/gnuradio-core/src/lib/general/gr_log2_const.h
@@ -6,7 +6,7 @@
  * 
  * GNU Radio 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, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -31,16 +31,16 @@
 
 template<unsigned int k> static inline int gr_log2_const() { assert(0); return 0; }
 
-template<> static inline int gr_log2_const<1>()   { return 0; }
-template<> static inline int gr_log2_const<2>()   { return 1; }
-template<> static inline int gr_log2_const<4>()   { return 2; }
-template<> static inline int gr_log2_const<8>()   { return 3; }
-template<> static inline int gr_log2_const<16>()  { return 4; }
-template<> static inline int gr_log2_const<32>()  { return 5; }
-template<> static inline int gr_log2_const<64>()  { return 6; }
-template<> static inline int gr_log2_const<128>() { return 7; }
-template<> static inline int gr_log2_const<256>() { return 8; }
-template<> static inline int gr_log2_const<512>() { return 9; }
-template<> static inline int gr_log2_const<1024>(){ return 10; }
+template<> inline int gr_log2_const<1>()   { return 0; }
+template<> inline int gr_log2_const<2>()   { return 1; }
+template<> inline int gr_log2_const<4>()   { return 2; }
+template<> inline int gr_log2_const<8>()   { return 3; }
+template<> inline int gr_log2_const<16>()  { return 4; }
+template<> inline int gr_log2_const<32>()  { return 5; }
+template<> inline int gr_log2_const<64>()  { return 6; }
+template<> inline int gr_log2_const<128>() { return 7; }
+template<> inline int gr_log2_const<256>() { return 8; }
+template<> inline int gr_log2_const<512>() { return 9; }
+template<> inline int gr_log2_const<1024>(){ return 10; }
 
 #endif /* INCLUDED_GR_LOG2_CONST_H */