MAINT-5011: Throw an actual exception in Force Software Exception.

http://en.cppreference.com/w/cpp/language/throw says of the plain throw syntax:

"This form is only allowed when an exception is presently being handled (it
calls std::terminate if used otherwise)."

On advice from Oz, replace plain 'throw;' with throwing a std::runtime_error.
meow-7.2.2
Nat Goodspeed 2016-07-13 14:58:12 -04:00
parent 21e8352de6
commit 2f003fd5a9
1 changed files with 2 additions and 2 deletions

View File

@ -231,6 +231,7 @@
#include "llcoproceduremanager.h"
#include "llviewereventrecorder.h"
#include <stdexcept>
// *FIX: These extern globals should be cleaned up.
// The globals either represent state/config/resource-storage of either
@ -5512,8 +5513,7 @@ void LLAppViewer::forceErrorInfiniteLoop()
void LLAppViewer::forceErrorSoftwareException()
{
LL_WARNS() << "Forcing a deliberate exception" << LL_ENDL;
// *FIX: Any way to insure it won't be handled?
throw;
throw std::runtime_error("User selected Force Software Exception");
}
void LLAppViewer::forceErrorDriverCrash()