Fix OSX 10.11 build

Eyescale · Oct 22, 2015 · c2fa9bc · c2fa9bc
1 parent 9fea5b2
commit c2fa9bc
Show file tree

Hide file tree

Showing 18 changed files with 82 additions and 81 deletions.
diff --git a/.gitsubprojects b/.gitsubprojects
@@ -1,8 +1,8 @@
 # -*- mode: cmake -*-
 git_subproject(vmmlib https://github.com/Eyescale/vmmlib.git 2bec113)
-git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 33546f1)
+git_subproject(Lunchbox https://github.com/Eyescale/Lunchbox.git 488fb83)
 git_subproject(Pression https://github.com/Eyescale/Pression.git 93883cf)
-git_subproject(hwsd https://github.com/Eyescale/hwsd.git f20749f)
-git_subproject(Collage https://github.com/Eyescale/Collage.git 182698e)
+git_subproject(hwsd https://github.com/Eyescale/hwsd.gite e0d00f4)
+git_subproject(Collage https://github.com/Eyescale/Collage.git f1b1f86)
 git_subproject(GLStats https://github.com/Eyescale/GLStats.git 3c76246)
-git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 8556bc3)
+git_subproject(Deflect https://github.com/BlueBrain/Deflect.git 4f20e62)
diff --git a/CMake/configure.cmake b/CMake/configure.cmake
@@ -3,8 +3,8 @@
 
 if(APPLE)
   # WAR otherwise MacPorts X11 (/opt/local) is preferred
-  list(REMOVE_ITEM CMAKE_SYSTEM_LIBRARY_PATH /opt/local/lib)
-  list(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH /opt/local)
+  list(REMOVE_ITEM CMAKE_SYSTEM_LIBRARY_PATH /opt/local/lib /usr/local/lib)
+  list(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH /opt/local /usr/local)
   link_directories(/opt/X11/lib /usr/X11R6/lib)
   include_directories(SYSTEM /opt/X11/include /usr/X11R6/include)
 endif()
@@ -100,8 +100,8 @@ endif()
 common_package_post()
 
 if(APPLE)
-  LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /opt/local/lib)
-  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /opt/local)
+  LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /opt/local/lib /usr/local/lib)
+  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /opt/local /usr/local)
 endif()
 
 if(CUDA_FOUND)

diff --git a/eq/agl/messagePump.h b/eq/agl/messagePump.h
@@ -38,9 +38,9 @@ class MessagePump : public eq::MessagePump
         /** Destruct this message pump. @version 1.0 */
         virtual ~MessagePump();
 
-        virtual void postWakeup();
-        virtual void dispatchAll();
-        virtual void dispatchOne( const uint32_t timeout=LB_TIMEOUT_INDEFINITE);
+        void postWakeup() final;
+        void dispatchAll() final;
+        void dispatchOne( const uint32_t timeout=LB_TIMEOUT_INDEFINITE ) final;
 
     private:
         EventQueueRef _receiverQueue;

diff --git a/eq/client.h b/eq/client.h
@@ -91,10 +91,10 @@ class Client : public fabric::Client
      *         <code>false</code> otherwise.
      * @version 1.0
      */
-    EQ_API virtual bool initLocal( const int argc, char** argv );
+    EQ_API bool initLocal( const int argc, char** argv ) override;
 
     /** De-initialize a local, listening node. @version 1.1.6 */
-    EQ_API virtual bool exitLocal();
+    EQ_API bool exitLocal() override;
 
     /**
      * @return true if the client has commands pending, false otherwise.
@@ -103,7 +103,7 @@ class Client : public fabric::Client
     EQ_API bool hasCommands();
 
     /** @internal @return the command queue to the main node thread. */
-    EQ_API virtual co::CommandQueue* getMainThreadQueue();
+    EQ_API co::CommandQueue* getMainThreadQueue() override;
 
     /** Experimental: interrupt main thread queue @internal */
     void interruptMainThread();

diff --git a/eq/compressor/compressorReadDrawPixels.h b/eq/compressor/compressorReadDrawPixels.h
@@ -46,7 +46,7 @@ class CompressorReadDrawPixels : public Compressor
     static void* getNewDecompressor( const unsigned name )
         { return new CompressorReadDrawPixels( name ); }
 
-    virtual void compress( const void* const, const uint64_t, const bool )
+    void compress( const void* const, const uint64_t, const bool ) override
         { LBDONTCALL; }
 
     static bool isCompatible( const GLEWContext* );

diff --git a/eq/compressor/compressorYUV.h b/eq/compressor/compressorYUV.h
@@ -42,7 +42,7 @@ class CompressorYUV : public Compressor
     static void* getNewDecompressor( const unsigned )
         { return new CompressorYUV; }
 
-    virtual void compress( const void* const, const uint64_t, const bool )
+    void compress( const void* const, const uint64_t, const bool ) override
         { LBDONTCALL; }
 
     static bool isCompatible( const GLEWContext* );

diff --git a/eq/config.h b/eq/config.h
@@ -187,7 +187,7 @@ class Config : public fabric::Config< Server, Config, Observer, Layout, Canvas,
     EQ_API bool update();
 
     /** @sa fabric::Config::setLatency() */
-    EQ_API virtual void setLatency( const uint32_t latency );
+    EQ_API void setLatency( const uint32_t latency ) override;
     //@}
 
     /** @name Object registry. */
@@ -199,7 +199,7 @@ class Config : public fabric::Config< Server, Config, Observer, Layout, Canvas,
      * local client node.
      * @version 1.0
      */
-    EQ_API virtual bool registerObject( co::Object* object );
+    EQ_API bool registerObject( co::Object* object ) override;
 
     /**
      * Deregister a distributed object.
@@ -210,7 +210,7 @@ class Config : public fabric::Config< Server, Config, Observer, Layout, Canvas,
      * @param object the object instance.
      * @version 1.0
      */
-    EQ_API virtual void deregisterObject( co::Object* object );
+    EQ_API void deregisterObject( co::Object* object ) override;
 
     /**
      * Map a distributed object.
@@ -228,13 +228,13 @@ class Config : public fabric::Config< Server, Config, Observer, Layout, Canvas,
                                 const uint128_t& version = co::VERSION_OLDEST );
 
     /** Start mapping a distributed object from a known master. @version 1.0 */
-    EQ_API virtual uint32_t mapObjectNB( co::Object* object,
-                                         const uint128_t& id,
-                                         const uint128_t& version,
-                                         co::NodePtr master );
+    EQ_API uint32_t mapObjectNB( co::Object* object,
+                                 const uint128_t& id,
+                                 const uint128_t& version,
+                                 co::NodePtr master ) override;
 
     /** Finalize the mapping of a distributed object. @version 1.0 */
-    EQ_API virtual bool mapObjectSync( const uint32_t requestID );
+    EQ_API bool mapObjectSync( const uint32_t requestID ) override;
 
     /**
      * Unmap a mapped object.
@@ -243,7 +243,7 @@ class Config : public fabric::Config< Server, Config, Observer, Layout, Canvas,
      * local client node.
      * @version 1.0
      */
-    EQ_API virtual void unmapObject( co::Object* object );
+    EQ_API void unmapObject( co::Object* object ) override;
 
     /**
      * Synchronize the local object with a remote object.
@@ -473,14 +473,14 @@ class Config : public fabric::Config< Server, Config, Observer, Layout, Canvas,
 
 protected:
     /** @internal */
-    EQ_API virtual void attach( const uint128_t& id,
-                                const uint32_t instanceID );
+    EQ_API void attach( const uint128_t& id,
+                        const uint32_t instanceID ) override;
 
-    EQ_API virtual void notifyAttached(); //!< @internal
-    EQ_API virtual void notifyDetach(); //!< @internal
+    EQ_API void notifyAttached() override; //!< @internal
+    EQ_API void notifyDetach() override; //!< @internal
     /** @internal */
-    EQ_API virtual void changeLatency( const uint32_t latency );
-    EQ_API virtual bool mapViewObjects() const; //!< @internal
+    EQ_API void changeLatency( const uint32_t latency ) override;
+    EQ_API bool mapViewObjects() const override; //!< @internal
 
 private:
     detail::Config* const _impl;

diff --git a/eq/glx/messagePump.h b/eq/glx/messagePump.h
@@ -39,9 +39,9 @@ namespace glx
         /** Destruct this message pump. @version 1.0 */
         virtual ~MessagePump();
 
-        virtual void postWakeup();
-        virtual void dispatchAll();
-        virtual void dispatchOne( const uint32_t timeout=LB_TIMEOUT_INDEFINITE);
+        void postWakeup() final;
+        void dispatchAll() final;
+        void dispatchOne( const uint32_t timeout=LB_TIMEOUT_INDEFINITE ) final;
 
         /**
          * Register a new Display connection for event dispatch.

diff --git a/eq/init.cpp b/eq/init.cpp
@@ -308,6 +308,7 @@ void _initPlugins()
     plugins.addDirectory( "/usr/local/share/Equalizer/plugins" );
     plugins.addDirectory( ".eqPlugins" );
     plugins.addDirectory( "/opt/local/lib" ); // MacPorts
+    plugins.addDirectory( "/usr/local/lib" ); // Homebrew
 
     const char* home = getenv( "HOME" );
     if( home )
@@ -354,6 +355,7 @@ void _exitPlugins()
     plugins.removeDirectory( "/usr/local/share/Equalizer/plugins" );
     plugins.removeDirectory( ".eqPlugins" );
     plugins.removeDirectory( "/opt/local/lib" ); // MacPorts
+    plugins.removeDirectory( "/usr/local/lib" ); // Homebrew
 
     const char* home = getenv( "HOME" );
     if( home )

diff --git a/eq/server/configUpdateSyncVisitor.h b/eq/server/configUpdateSyncVisitor.h
@@ -37,7 +37,7 @@ class ConfigUpdateSyncVisitor : public ConfigVisitor
     {}
     virtual ~ConfigUpdateSyncVisitor() {}
 
-    VisitorResult visitPre( Config* )
+    VisitorResult visitPre( Config* ) override
     {
         _runningChannels = 0;
         _failure = false;

diff --git a/eq/server/equalizers/dfrEqualizer.h b/eq/server/equalizers/dfrEqualizer.h
@@ -36,22 +36,22 @@ namespace server
     public:
         DFREqualizer();
         virtual ~DFREqualizer();
-        virtual void toStream( std::ostream& os ) const { os << this; }
+        void toStream( std::ostream& os ) const final { os << this; }
 
         /** @sa Equalizer::attach */
-        virtual void attach( Compound* compound );
+        void attach( Compound* compound ) final;
 
         /** @sa CompoundListener::notifyUpdatePre */
-        virtual void notifyUpdatePre( Compound* compound,
-                                      const uint32_t frameNumber );
+        void notifyUpdatePre( Compound* compound,
+                              const uint32_t frameNumber ) final;
 
         /** @sa ChannelListener::notifyLoadData */
-        virtual void notifyLoadData( Channel* channel,
-                                     const uint32_t frameNumber,
-                                     const Statistics& statistics,
-                                     const Viewport& region );
+        void notifyLoadData( Channel* channel,
+                             const uint32_t frameNumber,
+                             const Statistics& statistics,
+                             const Viewport& region ) final;
 
-        virtual uint32_t getType() const { return fabric::DFR_EQUALIZER; }
+        uint32_t getType() const final { return fabric::DFR_EQUALIZER; }
 
     protected:
         void notifyChildAdded( Compound*, Compound* ) override {}

diff --git a/eq/server/equalizers/framerateEqualizer.h b/eq/server/equalizers/framerateEqualizer.h
@@ -42,16 +42,16 @@ namespace server
         EQSERVER_API FramerateEqualizer();
         FramerateEqualizer( const FramerateEqualizer& from );
         virtual ~FramerateEqualizer();
-        virtual void toStream( std::ostream& os ) const { os << this; }
+        void toStream( std::ostream& os ) const final { os << this; }
 
         /** @sa Equalizer::attach */
-        virtual void attach( Compound* compound );
+        void attach( Compound* compound ) final;
 
         /** @sa CompoundListener::notifyUpdatePre */
-        virtual void notifyUpdatePre( Compound* compound,
-                                      const uint32_t frameNumber );
+        void notifyUpdatePre( Compound* compound,
+                              const uint32_t frameNumber ) final;
 
-        virtual uint32_t getType() const { return fabric::FRAMERATE_EQUALIZER; }
+        uint32_t getType() const final { return fabric::FRAMERATE_EQUALIZER; }
 
     protected:
         void notifyChildAdded( Compound*, Compound* ) override

diff --git a/eq/server/equalizers/loadEqualizer.h b/eq/server/equalizers/loadEqualizer.h
@@ -41,19 +41,19 @@ class LoadEqualizer : public Equalizer, protected ChannelListener
     EQSERVER_API LoadEqualizer();
     explicit LoadEqualizer( const fabric::Equalizer& from );
     virtual ~LoadEqualizer();
-    virtual void toStream( std::ostream& os ) const { os << this; }
+    void toStream( std::ostream& os ) const final { os << this; }
 
     /** @sa CompoundListener::notifyUpdatePre */
-    virtual void notifyUpdatePre( Compound* compound,
-                                  const uint32_t frameNumber );
+    void notifyUpdatePre( Compound* compound,
+                          const uint32_t frameNumber ) final;
 
     /** @sa ChannelListener::notifyLoadData */
-    virtual void notifyLoadData( Channel* channel,
-                                 const uint32_t frameNumber,
-                                 const Statistics& statistics,
-                                 const Viewport& region );
+    void notifyLoadData( Channel* channel,
+                         const uint32_t frameNumber,
+                         const Statistics& statistics,
+                         const Viewport& region ) final;
 
-    virtual uint32_t getType() const { return fabric::LOAD_EQUALIZER; }
+    uint32_t getType() const final { return fabric::LOAD_EQUALIZER; }
 
 protected:
     void notifyChildAdded( Compound*, Compound* ) override

diff --git a/eq/server/equalizers/monitorEqualizer.h b/eq/server/equalizers/monitorEqualizer.h
@@ -36,16 +36,16 @@ namespace server
         MonitorEqualizer();
         MonitorEqualizer( const MonitorEqualizer& from );
         virtual ~MonitorEqualizer();
-        virtual void toStream( std::ostream& os ) const { os << this; }
+        void toStream( std::ostream& os ) const final { os << this; }
 
         /** @sa Equalizer::attach. */
-        virtual void attach( Compound* compound );
+        void attach( Compound* compound ) final;
 
         /** @sa CompoundListener::notifyUpdatePre */
-        virtual void notifyUpdatePre( Compound* compound,
-                                      const uint32_t frameNumber );
+        void notifyUpdatePre( Compound* compound,
+                              const uint32_t frameNumber ) final;
 
-        virtual uint32_t getType() const { return fabric::MONITOR_EQUALIZER; }
+        uint32_t getType() const final { return fabric::MONITOR_EQUALIZER; }
 
     protected:
         void notifyChildAdded( Compound*, Compound* ) override {}

diff --git a/eq/server/equalizers/tileEqualizer.h b/eq/server/equalizers/tileEqualizer.h
@@ -36,15 +36,15 @@ class TileEqualizer : public Equalizer
     ~TileEqualizer() {}
 
     /** @sa CompoundListener::notifyUpdatePre */
-    virtual void notifyUpdatePre( Compound* compound,
-                                  const uint32_t frameNumber );
+    void notifyUpdatePre( Compound* compound,
+                          const uint32_t frameNumber ) final;
 
-    virtual void toStream( std::ostream& os ) const { os << this; }
+    void toStream( std::ostream& os ) const final { os << this; }
     void setName( const std::string& name ) { _name = name; }
 
     const std::string& getName() const { return _name; }
 
-    virtual uint32_t getType() const { return fabric::TILE_EQUALIZER; }
+    uint32_t getType() const final { return fabric::TILE_EQUALIZER; }
 
 protected:
     void notifyChildAdded( Compound*, Compound* ) override {}

diff --git a/eq/server/equalizers/treeEqualizer.h b/eq/server/equalizers/treeEqualizer.h
@@ -41,19 +41,18 @@ namespace server
         EQSERVER_API TreeEqualizer();
         TreeEqualizer( const TreeEqualizer& from );
         virtual ~TreeEqualizer();
-        virtual void toStream( std::ostream& os ) const { os << this; }
+        void toStream( std::ostream& os ) const final { os << this; }
 
         /** @sa CompoundListener::notifyUpdatePre */
-        virtual void notifyUpdatePre( Compound* compound,
-                                      const uint32_t frameNumber );
+        void notifyUpdatePre( Compound* compound,
+                              const uint32_t frameNumber ) final;
 
         /** @sa ChannelListener::notifyLoadData */
-        virtual void notifyLoadData( Channel* channel,
-                                     const uint32_t frameNumber,
-                                     const Statistics& statistics,
-                                     const Viewport& region );
+        void notifyLoadData( Channel* channel, const uint32_t frameNumber,
+                             const Statistics& statistics,
+                             const Viewport& region ) final;
 
-        virtual uint32_t getType() const { return fabric::TREE_EQUALIZER; }
+        uint32_t getType() const final { return fabric::TREE_EQUALIZER; }
 
     protected:
         void notifyChildAdded( Compound*, Compound* ) override

diff --git a/eq/server/equalizers/viewEqualizer.h b/eq/server/equalizers/viewEqualizer.h
@@ -41,16 +41,16 @@ namespace server
         EQSERVER_API ViewEqualizer();
         ViewEqualizer( const ViewEqualizer& from );
         virtual ~ViewEqualizer();
-        virtual void toStream( std::ostream& os ) const { os << this; }
+        void toStream( std::ostream& os ) const final { os << this; }
 
         /** @sa Equalizer::attach. */
-        virtual void attach( Compound* compound );
+        void attach( Compound* compound ) final;
 
         /** @sa CompoundListener::notifyUpdatePre */
-        virtual void notifyUpdatePre( Compound* compound,
-                                      const uint32_t frameNumber );
+        void notifyUpdatePre( Compound* compound,
+                              const uint32_t frameNumber ) final;
 
-        virtual uint32_t getType() const { return fabric::VIEW_EQUALIZER; }
+        uint32_t getType() const final { return fabric::VIEW_EQUALIZER; }
 
     protected:
         void notifyChildAdded( Compound*, Compound* ) override

diff --git a/examples/eqPly/vertexBufferState.h b/examples/eqPly/vertexBufferState.h
@@ -82,10 +82,10 @@ class VertexBufferState : public triply::VertexBufferState
 
     void setChannel( Channel* channel ) { _channel = channel; }
 
-    virtual bool stopRendering( ) const
+    bool stopRendering( ) const override
         { return _channel ? _channel->stopRendering() : false; }
 
-    virtual void declareRegion( const triply::Vector4f& region )
+    void declareRegion( const triply::Vector4f& region ) override
         { if( _channel ) _channel->declareRegion( eq::Viewport( region )); }
 
 private: