diff options
| author | ipkn <ipknhama@gmail.com> | 2015-05-09 23:32:42 +0900 |
|---|---|---|
| committer | ipkn <ipknhama@gmail.com> | 2015-05-09 23:32:42 +0900 |
| commit | 4f5e36f9274cec4f984529ddc7576991a82ab379 (patch) | |
| tree | 6aa9b6d495450120fb2b9da1a35ae5035a4a3ef7 /include | |
| parent | 9c1870c2a5e86808fc9380b72bed09975bdd3efe (diff) | |
| parent | a0ffd76e9ce00af835eb5d19a4f21f88ee6d7ea4 (diff) | |
| download | crow-4f5e36f9274cec4f984529ddc7576991a82ab379.tar.gz crow-4f5e36f9274cec4f984529ddc7576991a82ab379.zip | |
Merge pull request #60 from sivachandran/master
Fix for linker symbol redefinition errors when crow header is included in multiple source files
Diffstat (limited to 'include')
| -rw-r--r-- | include/utility.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/utility.h b/include/utility.h index 9d1e941..cf12158 100644 --- a/include/utility.h +++ b/include/utility.h @@ -163,7 +163,7 @@ struct parameter_tag<t> \ : sub_value; }; - bool is_parameter_tag_compatible(uint64_t a, uint64_t b) + static inline bool is_parameter_tag_compatible(uint64_t a, uint64_t b) { if (a == 0) return b == 0; @@ -178,7 +178,7 @@ struct parameter_tag<t> \ return is_parameter_tag_compatible(a/6, b/6); } - unsigned find_closing_tag_runtime(const char* s, unsigned p) + static inline unsigned find_closing_tag_runtime(const char* s, unsigned p) { return s[p] == 0 @@ -187,7 +187,7 @@ struct parameter_tag<t> \ ? p : find_closing_tag_runtime(s, p + 1); } - uint64_t get_parameter_tag_runtime(const char* s, unsigned p = 0) + static inline uint64_t get_parameter_tag_runtime(const char* s, unsigned p = 0) { return s[p] == 0 |