Commit 9f0abd51 authored by Amy Stamile's avatar Amy Stamile
Browse files

Updated MemoryAllocFailed

parent 9103aebf

isis/src/base/objs/Buffer/Buffer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ namespace Isis { 
        p_buf = NULL;

        p_rawbuf = NULL;

      }

      QString message = Message::MemoryAllocationFailed();

      std::string message = Message::MemoryAllocationFailed();

      throw IException(IException::Unknown, message, _FILEINFO_);

    }

  }

isis/src/core/include/Message.h

+2 −2
Original line number Diff line number Diff line
@@ -245,10 +245,10 @@ namespace Isis { 
     * This error should be used when an error accrues during a memory

     * allocation such as "new".

     *

     * @return QString - A standardized Isis error message with the parameter

     * @return std::string - A standardized Isis error message with the parameter

     *                  inserted

     */

    QString MemoryAllocationFailed();

    std::string MemoryAllocationFailed();

  }

}

isis/src/core/src/MemoryAllocationFailed.cpp

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ find files of those names at the top level of this repository. **/ 


using namespace std;



QString Isis::Message::MemoryAllocationFailed() {

std::string Isis::Message::MemoryAllocationFailed() {

  return "Unable to allocate dynamic memory";

}