Fix a few compile errors with C++11 on macOS.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Sep 2016 09:41:20 +0000 (11:41 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 8 Oct 2016 13:03:53 +0000 (15:03 +0200)
intern/ghost/intern/GHOST_NDOFManager.cpp
intern/ghost/intern/GHOST_NDOFManager.h
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
intern/ghost/intern/GHOST_NDOFManagerUnix.cpp
intern/ghost/intern/GHOST_SystemWin32.cpp
source/blender/render/intern/raytrace/rayobject_rtbuild.cpp

index c8e14ad357f4f49e6054338bafa64bc8c6267d73..cab9bf45b806694c1f65d6cdb23e3007b5b7ae3b 100644 (file)
@@ -324,14 +324,14 @@ bool GHOST_NDOFManager::setDevice(unsigned short vendor_id, unsigned short produ
        return m_deviceType != NDOF_UnknownDevice;
 }
 
-void GHOST_NDOFManager::updateTranslation(const short t[3], GHOST_TUns64 time)
+void GHOST_NDOFManager::updateTranslation(const int t[3], GHOST_TUns64 time)
 {
        memcpy(m_translation, t, sizeof(m_translation));
        m_motionTime = time;
        m_motionEventPending = true;
 }
 
-void GHOST_NDOFManager::updateRotation(const short r[3], GHOST_TUns64 time)
+void GHOST_NDOFManager::updateRotation(const int r[3], GHOST_TUns64 time)
 {
        memcpy(m_rotation, r, sizeof(m_rotation));
        m_motionTime = time;
index 83d06ef5871403b2da9642b0c371a9c78d501d31..0c0b945d54893b739e4a7090f87c8ffeeaeb314c 100644 (file)
@@ -138,8 +138,8 @@ public:
        //       rotations are + when CCW, - when CW
        // each platform is responsible for getting axis data into this form
        // these values should not be scaled (just shuffled or flipped)
-       void updateTranslation(const short t[3], GHOST_TUns64 time);
-       void updateRotation(const short r[3], GHOST_TUns64 time);
+       void updateTranslation(const int t[3], GHOST_TUns64 time);
+       void updateRotation(const int r[3], GHOST_TUns64 time);
 
        // the latest raw button data from the device
        // use HID button encoding (not NDOF_ButtonT)
@@ -163,8 +163,8 @@ private:
        int m_buttonMask;
        const NDOF_ButtonT *m_hidMap;
 
-       short m_translation[3];
-       short m_rotation[3];
+       int m_translation[3];
+       int m_rotation[3];
        int m_buttons; // bit field
 
        GHOST_TUns64 m_motionTime; // in milliseconds
index 3cce6bf520b0ce658df60f55904a8cc71c8c00a3..e6fbc96ae7af32909a0c2bcce823ef6f896c50b9 100644 (file)
@@ -200,8 +200,8 @@ static void DeviceEvent(uint32_t unused, uint32_t msg_type, void* msg_arg)
                                case kConnexionCmdHandleAxis:
                                {
                                        // convert to blender view coordinates
-                                       const short t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]};
-                                       const short r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])};
+                                       const int t[3] = {s->axis[0], -(s->axis[2]), s->axis[1]};
+                                       const int r[3] = {-(s->axis[3]), s->axis[5], -(s->axis[4])};
 
                                        ndof_manager->updateTranslation(t, now);
                                        ndof_manager->updateRotation(r, now);
index ded13b5c0949129320c391d2d7a7b04450fd73e8..fff5aba6f9e3872128d9b37cbbe4a48115366b37 100644 (file)
@@ -107,8 +107,8 @@ bool GHOST_NDOFManagerUnix::processEvents()
                                {
                                        /* convert to blender view coords */
                                        GHOST_TUns64 now = m_system.getMilliSeconds();
-                                       const short t[3] = {(short)e.motion.x, (short)e.motion.y, (short)-e.motion.z};
-                                       const short r[3] = {(short)-e.motion.rx, (short)-e.motion.ry, (short)e.motion.rz};
+                                       const int t[3] = {(int)e.motion.x, (int)e.motion.y, (int)-e.motion.z};
+                                       const int r[3] = {(int)-e.motion.rx, (int)-e.motion.ry, (int)e.motion.rz};
 
                                        updateTranslation(t, now);
                                        updateRotation(r, now);
@@ -128,7 +128,7 @@ bool GHOST_NDOFManagerUnix::processEvents()
 #ifdef USE_FINISH_GLITCH_WORKAROUND
                if (motion_test_prev == true && motion_test == false) {
                        GHOST_TUns64 now = m_system.getMilliSeconds();
-                       const short v[3] = {0, 0, 0};
+                       const int v[3] = {0, 0, 0};
 
                        updateTranslation(v, now);
                        updateRotation(v, now);
index e43634508b7fbe8768154406ca07da131191f81a..7d55a973f9151c6294774692e2a26e0c8a24e364 100644 (file)
@@ -879,12 +879,12 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const &raw)
                {
                        const short *axis = (short *)(data + 1);
                        // massage into blender view coords (same goes for rotation)
-                       const short t[3] = {axis[0], -axis[2], axis[1]};
+                       const int t[3] = {axis[0], -axis[2], axis[1]};
                        m_ndofManager->updateTranslation(t, now);
 
                        if (raw.data.hid.dwSizeHid == 13) {
                                // this report also includes rotation
-                               const short r[3] = {-axis[3], axis[5], -axis[4]};
+                               const int r[3] = {-axis[3], axis[5], -axis[4]};
                                m_ndofManager->updateRotation(r, now);
 
                                // I've never gotten one of these, has anyone else?
@@ -895,7 +895,7 @@ bool GHOST_SystemWin32::processNDOF(RAWINPUT const &raw)
                case 2: // rotation
                {
                        const short *axis = (short *)(data + 1);
-                       const short r[3] = {-axis[0], axis[2], -axis[1]};
+                       const int r[3] = {-axis[0], axis[2], -axis[1]};
                        m_ndofManager->updateRotation(r, now);
                        break;
                }
index 724a809077eab6b96c6fafda4ec54189b956fca5..81e41a20f2e6626577af80bae3d63911fd8b9dda 100644 (file)
 
 
 #include <assert.h>
-#include <math.h>
 #include <stdlib.h>
 #include <algorithm>
 
+#if __cplusplus >= 201103L
+#include <cmath>
+using std::isfinite;
+#else
+#include <math.h>
+#endif
+
 #include "rayobject_rtbuild.h"
 
 #include "MEM_guardedalloc.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#if __cplusplus >= 201103L
-using std::isfinite;
-#endif
-
 static bool selected_node(RTBuilder::Object *node)
 {
        return node->selected;