From 519b4a3ae10c96951db917f2439982c7d2391874 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Fri, 22 Jun 2018 13:21:52 +0200
Subject: compat/macros: rename portability macros

use `cc_xx' rather than awkward synonyms.
---
 logic/pipeline.cpp | 10 +++++-----
 logic/pipeline.hpp |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'logic')

diff --git a/logic/pipeline.cpp b/logic/pipeline.cpp
index 9c9f35a6..7b4444c3 100644
--- a/logic/pipeline.cpp
+++ b/logic/pipeline.cpp
@@ -234,18 +234,18 @@ static bool is_nan(const dmat<u,w>& r)
 }
 
 template<typename x>
-static force_inline bool nan_check_(const x& datum)
+static cc_forceinline bool nan_check_(const x& datum)
 {
     return is_nan(datum);
 }
 
 template<typename x, typename y, typename... xs>
-static force_inline bool nan_check_(const x& datum, const y& next, const xs&... rest)
+static cc_forceinline bool nan_check_(const x& datum, const y& next, const xs&... rest)
 {
     return is_nan(datum) || nan_check_(next, rest...);
 }
 
-static never_inline
+static cc_noinline
 void emit_nan_check_msg(const char* text, const char* fun, int line)
 {
     once_only(
@@ -257,7 +257,7 @@ void emit_nan_check_msg(const char* text, const char* fun, int line)
 }
 
 template<typename... xs>
-static never_inline
+static cc_noinline
 bool maybe_nan(const char* text, const char* fun, int line, const xs&... vals)
 {
     if (nan_check_(vals...))
@@ -273,7 +273,7 @@ bool maybe_nan(const char* text, const char* fun, int line, const xs&... vals)
 #define nan_check(...)                                                              \
     do                                                                              \
     {                                                                               \
-        if (likely(!maybe_nan(#__VA_ARGS__, OTR_FUNNAME, __LINE__, __VA_ARGS__)))   \
+        if (likely(!maybe_nan(#__VA_ARGS__, cc_function_name, __LINE__, __VA_ARGS__)))   \
             (void)0;                                                                \
         else                                                                        \
             goto error;                                                             \
diff --git a/logic/pipeline.hpp b/logic/pipeline.hpp
index 79042727..4a676862 100644
--- a/logic/pipeline.hpp
+++ b/logic/pipeline.hpp
@@ -49,14 +49,14 @@ public:
 
     void on_center();
 
-    warn_result_unused
+    cc_warn_unused_result
     euler_t rotate(const rmat& rmat, const euler_t& in, vec3_bool disable) const;
 
-    warn_result_unused
+    cc_warn_unused_result
     Pose apply_pipeline(reltrans_state state, const Pose& value,
                         const vec6_bool& disable, bool neck_enable, int neck_z);
 
-    warn_result_unused
+    cc_warn_unused_result
     euler_t apply_neck(const Pose& value, int nz, bool disable_tz) const;
 };
 
-- 
cgit v1.2.3