Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Port to boost::signals2

Browse Source
This commit is contained in:
Aleric Inglewood
2011-06-09 15:25:03 +02:00
parent 5d87098bd0
commit 425e1581ae
11 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llxml/CMakeLists.txt
View File

@@ -38,6 +38,5 @@ add_library (llxml ${llxml_SOURCE_FILES})
add_dependencies(llxml prepare)
target_link_libraries(
llxml
${BOOST_SIGNALS_LIBRARY}
${EXPAT_LIBRARIES}
)

6
indra/llxml/llcontrol.h
View File

@@ -55,7 +55,7 @@
#endif
#include <boost/bind.hpp>
#include <boost/signal.hpp>
#include <boost/signals2.hpp>
#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<void(const LLSD&)> signal_t;
typedef boost::signals2::signal<void(const LLSD&)> signal_t;
private:
std::string mName;
@@ -295,7 +295,7 @@ class LLCachedControl
private:
T mCachedValue;
LLPointer<LLControlVariable> mControl;
boost::signals::connection mConnection;
boost::signals2::connection mConnection;
LLControlGroup *mControlGroup;
public: