Changeset 17142 for trunk

Timestamp:

09/07/13 16:17:45 (11 years ago)

Author:

tbretz

Message:

The two functions need an inline tag, otherwise they can end up in two different object files which then cannot belinked together.

File:

• trunk/Mars/mcore/huffman.h (modified) (2 diffs)

trunk/Mars/mcore/huffman.h

@@ -383 +383 @@
     };
 
-    bool Encode(std::string &bufout, const uint16_t *bufin, size_t bufinlen)
+    inline bool Encode(std::string &bufout, const uint16_t *bufin, size_t bufinlen)
     {
         const Encoder encoder(bufin, bufinlen);
@@ -399 +399 @@
     }
 
-    int64_t Decode(const uint8_t *bufin,
-               size_t         bufinlen,
-               std::vector<uint16_t> &pbufout)
+    inline int64_t Decode(const uint8_t *bufin,
+                          size_t         bufinlen,
+                          std::vector<uint16_t> &pbufout)
     {
         int64_t i = 0;