diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 5ebc7959f..0cd10bd6c 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -10,7 +10,6 @@ if (STANDALONE) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt) else (STANDALONE) use_prebuilt_binary(boost) @@ -39,21 +38,16 @@ else (STANDALONE) set(BOOST_REGEX_LIBRARY optimized libboost_regex-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} debug libboost_regex-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) - set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc${MSVC_SUFFIX}-${BOOST_OPTIM_SUFFIX}-${BOOST_VERSION} - debug libboost_signals-vc${MSVC_SUFFIX}-${BOOST_DEBUG_SUFFIX}-${BOOST_VERSION}) elseif (DARWIN) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt) elseif (LINUX) set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) set(BOOST_REGEX_LIBRARY boost_regex-mt) - set(BOOST_SIGNALS_LIBRARY boost_signals-mt) set(BOOST_SYSTEM_LIBRARY boost_system-mt) endif (WINDOWS) endif (STANDALONE) diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 13ca40cf9..9348cc7e8 100644 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -734,7 +734,7 @@ void LLNotificationChannelBase::connectChanged(const LLStandardSignal::slot_type // only about new notifications for (LLNotificationSet::iterator it = mItems.begin(); it != mItems.end(); ++it) { - slot.get_slot_function()(LLSD().with("sigtype", "load").with("id", (*it)->id())); + slot(LLSD().with("sigtype", "load").with("id", (*it)->id())); } // and then connect the signal so that all future notifications will also be // forwarded. diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index 4b325f54d..509a443e5 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -91,8 +91,8 @@ #include #include -#include #include +#include // we want to minimize external dependencies, but this one is important #include "llsd.h" @@ -112,7 +112,7 @@ typedef boost::shared_ptr LLNotificationPtr; *****************************************************************************/ /** - * A boost::signals Combiner that stops the first time a handler returns true + * A boost::signals2 Combiner that stops the first time a handler returns true * We need this because we want to have our handlers return bool, so that * we have the option to cause a handler to stop further processing. The * default handler fails when the signal returns a value but has no slots. @@ -164,7 +164,7 @@ typedef boost::function LLNotificationResponder typedef LLFunctorRegistry LLNotificationFunctorRegistry; typedef LLFunctorRegistration LLNotificationFunctorRegistration; -typedef boost::signal LLStandardSignal; +typedef boost::signals2::signal LLStandardSignal; // context data that can be looked up via a notification's payload by the display logic // derive from this class to implement specific contexts @@ -700,7 +700,7 @@ typedef std::multimap LLNotificationMap; // all of the built-in tests should attach to the "Visible" channel // class LLNotificationChannelBase : - public boost::signals::trackable + public boost::signals2::trackable { LOG_CLASS(LLNotificationChannelBase); public: diff --git a/indra/llui/llpanel.h b/indra/llui/llpanel.h index 378b3578f..a442a94db 100644 --- a/indra/llui/llpanel.h +++ b/indra/llui/llpanel.h @@ -56,7 +56,7 @@ const BOOL BORDER_NO = FALSE; * With or without border, * Can contain LLUICtrls. */ -class LLPanel : public LLUICtrl, public boost::signals::trackable +class LLPanel : public LLUICtrl, public boost::signals2::trackable { public: diff --git a/indra/llui/llui.h b/indra/llui/llui.h index abc9a298b..a77ffa32e 100644 --- a/indra/llui/llui.h +++ b/indra/llui/llui.h @@ -43,7 +43,7 @@ #include "llgl.h" // *TODO: break this dependency #include #include "lltexture.h" -#include +#include // LLUIFactory #include "llsd.h" @@ -605,7 +605,7 @@ public: class LLCallbackRegistry { public: - typedef boost::signal callback_signal_t; + typedef boost::signals2::signal callback_signal_t; void registerCallback(const callback_signal_t::slot_type& slot) { diff --git a/indra/llui/llview.h b/indra/llui/llview.h index 7e8c8668a..f12dee6d2 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -666,7 +666,7 @@ private: typedef std::map dummy_widget_map_t; mutable dummy_widget_map_t mDummyWidgets; - boost::signals::connection mControlConnection; + boost::signals2::connection mControlConnection; ECursorType mHoverCursor; diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt index 54976f420..535cfc010 100644 --- a/indra/llxml/CMakeLists.txt +++ b/indra/llxml/CMakeLists.txt @@ -38,6 +38,5 @@ add_library (llxml ${llxml_SOURCE_FILES}) add_dependencies(llxml prepare) target_link_libraries( llxml - ${BOOST_SIGNALS_LIBRARY} ${EXPAT_LIBRARIES} ) diff --git a/indra/llxml/llcontrol.h b/indra/llxml/llcontrol.h index e5cbf7354..28252f13a 100644 --- a/indra/llxml/llcontrol.h +++ b/indra/llxml/llcontrol.h @@ -55,7 +55,7 @@ #endif #include -#include +#include #if LL_WINDOWS # if (_MSC_VER >= 1300 && _MSC_VER < 1400) @@ -95,7 +95,7 @@ typedef enum e_control_type class LLControlVariable : public LLRefCount { friend class LLControlGroup; - typedef boost::signal signal_t; + typedef boost::signals2::signal signal_t; private: std::string mName; @@ -295,7 +295,7 @@ class LLCachedControl private: T mCachedValue; LLPointer mControl; - boost::signals::connection mConnection; + boost::signals2::connection mConnection; LLControlGroup *mControlGroup; public: diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index eb4e0c3d8..5086b88b6 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1438,7 +1438,6 @@ target_link_libraries(${VIEWER_BINARY_NAME} ${BOOST_FILESYSTEM_LIBRARY} ${BOOST_PROGRAM_OPTIONS_LIBRARY} ${BOOST_REGEX_LIBRARY} - ${BOOST_SIGNALS_LIBRARY} ${BOOST_SYSTEM_LIBRARY} ${DBUSGLIB_LIBRARIES} ${OPENGL_LIBRARIES} diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp index 9c7420898..55e3dd5d1 100644 --- a/indra/newview/llface.cpp +++ b/indra/newview/llface.cpp @@ -1517,7 +1517,7 @@ BOOL LLFace::verify(const U32* indices_array) const // but present this info. // To clean up the log, the geometry could be cleared, or the // face could otherwise be marked for no ::verify. - llinfos << "Face with no vertex buffer and " << mGeomCount << " mGeomCount" << llendl; + //AIFIXME: llinfos << "Face with no vertex buffer and " << mGeomCount << " mGeomCount" << llendl; } return TRUE; } diff --git a/indra/newview/statemachine/aistatemachine.h b/indra/newview/statemachine/aistatemachine.h index 42419cdb8..094f30031 100644 --- a/indra/newview/statemachine/aistatemachine.h +++ b/indra/newview/statemachine/aistatemachine.h @@ -33,7 +33,7 @@ #include "aithreadsafe.h" #include "llfasttimer.h" -#include +#include //! // A AIStateMachine is a base class that allows derived classes to @@ -194,12 +194,12 @@ class AIStateMachine { bool mAbortParent; //!< If true, abort parent on abort(). Otherwise continue as normal. // From outside a state machine: struct callback_type { - typedef boost::signal signal_type; + typedef boost::signals2::signal signal_type; callback_type(signal_type::slot_type const& slot) { connection = signal.connect(slot); } ~callback_type() { connection.disconnect(); } void callback(bool success) const { signal(success); } private: - boost::signals::connection connection; + boost::signals2::connection connection; signal_type signal; }; callback_type* mCallback; //!< Pointer to signal/connection, or NULL when not connected.