summaryrefslogtreecommitdiff
path: root/indra/llmessage/tests
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-08-17 11:36:24 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-08-17 11:36:24 -0400
commit5e9d2f57c82a57307a48afea09aa539b9fa80abf (patch)
treeea16b2c580c2a831f54c217deb5d64b8d755eff4 /indra/llmessage/tests
parent1ed76c382e8b87bff02b6d37cf8acd7f6b1f8063 (diff)
MAINT-5011: Use LLTHROW() instead of plain BOOST_THROW_EXCEPTION().
A level of preprocessor indirection lets us later change the implementation if desired.
Diffstat (limited to 'indra/llmessage/tests')
-rw-r--r--indra/llmessage/tests/commtest.h3
-rw-r--r--indra/llmessage/tests/networkio.h5
2 files changed, 3 insertions, 5 deletions
diff --git a/indra/llmessage/tests/commtest.h b/indra/llmessage/tests/commtest.h
index 5dff56b44f..7c8f27bbd2 100644
--- a/indra/llmessage/tests/commtest.h
+++ b/indra/llmessage/tests/commtest.h
@@ -38,7 +38,6 @@
#include <map>
#include <string>
#include <boost/lexical_cast.hpp>
-#include <boost/throw_exception.hpp>
struct CommtestError: public LLException
{
@@ -69,7 +68,7 @@ static int query_port(const std::string& var)
const char* cport = getenv(var.c_str());
if (! cport)
{
- BOOST_THROW_EXCEPTION(CommtestError(STRINGIZE("missing environment variable" << var)));
+ LLTHROW(CommtestError(STRINGIZE("missing environment variable" << var)));
}
// This will throw, too, if the value of PORT isn't numeric.
int port(boost::lexical_cast<int>(cport));
diff --git a/indra/llmessage/tests/networkio.h b/indra/llmessage/tests/networkio.h
index 6aaecf9bac..5eb739393f 100644
--- a/indra/llmessage/tests/networkio.h
+++ b/indra/llmessage/tests/networkio.h
@@ -35,7 +35,6 @@
#include "llpumpio.h"
#include "llhttpclient.h"
#include "llexception.h"
-#include <boost/throw_exception.hpp>
/*****************************************************************************
* NetworkIO
@@ -53,7 +52,7 @@ public:
ll_init_apr();
if (! gAPRPoolp)
{
- BOOST_THROW_EXCEPTION(LLException("Can't initialize APR"));
+ LLTHROW(LLException("Can't initialize APR"));
}
// Create IO Pump to use for HTTP Requests.
@@ -61,7 +60,7 @@ public:
LLHTTPClient::setPump(*mServicePump);
if (ll_init_ares() == NULL || !gAres->isInitialized())
{
- BOOST_THROW_EXCEPTION(LLException("Can't start DNS resolver"));
+ LLTHROW(LLException("Can't start DNS resolver"));
}
// You can interrupt pump() without waiting the full timeout duration