Merging upstream version 1.15~rc1.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 1 insertions, 1 deletions

diff --git a/encoder.h b/encoder.h
index 973ba6c..577ceeb 100644
--- a/encoder.h
+++ b/encoder.h
@@ -42,7 +42,7 @@ public:
 
 extern Dis_slots dis_slots;
 
-static inline uint8_t get_slot( const uint32_t dis )
+inline uint8_t get_slot( const uint32_t dis )
   {
   if( dis < (1 << 10) ) return dis_slots[dis];
   if( dis < (1 << 19) ) return dis_slots[dis>> 9] + 18;