diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-12-03 11:51:50 -0800 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-12-03 11:51:50 -0800 |
| commit | 18901432e93ab887726b58354ae45ddb43e8ed27 (patch) | |
| tree | a56ff5c05aeaccf887756058043c2aa33f0a35e3 | |
| parent | ed0596cfc7150021fdb37faa77fdf1b51859bc4b (diff) | |
| parent | d805fab31e75c268ee6d9eb888c596a63caffc18 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
| -rw-r--r-- | indra/llcommon/llevents.h | 10 | ||||
| -rw-r--r-- | indra/llcommon/tests/llerror_test.cpp | 9 | ||||
| -rw-r--r-- | install.xml | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/indra/llcommon/llevents.h b/indra/llcommon/llevents.h index ed714e4e40..a73ada2931 100644 --- a/indra/llcommon/llevents.h +++ b/indra/llcommon/llevents.h @@ -257,6 +257,11 @@ namespace LLEventDetail /// signature. typedef boost::function<LLBoundListener(const LLEventListener&)> ConnectFunc; + /// overload of visit_and_connect() when we have a string identifier available + template <typename LISTENER> + LLBoundListener visit_and_connect(const std::string& name, + const LISTENER& listener, + const ConnectFunc& connect_func); /** * Utility template function to use Visitor appropriately * @@ -271,11 +276,6 @@ namespace LLEventDetail { return visit_and_connect("", listener, connect_func); } - /// overload of visit_and_connect() when we have a string identifier available - template <typename LISTENER> - LLBoundListener visit_and_connect(const std::string& name, - const LISTENER& listener, - const ConnectFunc& connect_func); } // namespace LLEventDetail /***************************************************************************** diff --git a/indra/llcommon/tests/llerror_test.cpp b/indra/llcommon/tests/llerror_test.cpp index 1558df231a..6785d0cf17 100644 --- a/indra/llcommon/tests/llerror_test.cpp +++ b/indra/llcommon/tests/llerror_test.cpp @@ -545,6 +545,15 @@ namespace tut // output order void ErrorTestObject::test<10>() { +#if LL_LINUX + skip("Fails on Linux, see comments"); +// on Linux: +// [error, 10] fail: 'order is time type location function message: expected +// '1947-07-08T03:04:05Z INFO: llcommon/tests/llerror_test.cpp(268) : +// writeReturningLocationAndFunction: apple' actual +// '1947-07-08T03:04:05Z INFO: llcommon/tests/llerror_test.cpp(268) : +// LLError::NoClassInfo::writeReturningLocationAndFunction: apple'' +#endif LLError::setPrintLocation(true); LLError::setTimeFunction(roswell); mRecorder.setWantsTime(true); diff --git a/install.xml b/install.xml index af94de9f8e..efcfe9420c 100644 --- a/install.xml +++ b/install.xml @@ -200,16 +200,16 @@ <key>linux</key> <map> <key>md5sum</key> - <string>8fb4151b883b5f5d2b12da19a6ff8e7d</string> + <string>7085044567999489d82b9ed28f16e480</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux-20090804.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20091202.tar.bz2</uri> </map> <key>linux64</key> <map> <key>md5sum</key> - <string>77237f33b1740daef0dc1e6c801f68e1</string> + <string>b4aeefcba3d749f1e9f2a12c6f70192b</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.34.1-linux64-20090804.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux64-20091202.tar.bz2</uri> </map> <key>windows</key> <map> |