X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fdbms.oracle%2FDatabase.cpp;h=2ff1553e8d334a539a3d0899c6ab1da9693f7c08;hb=5a6cba5fde2b2f538a7515f8293cc0a8d9589dfa;hp=276d1432a6c46b0e02f2675d7effa1568bba5cb0;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git diff --git a/source/dbms.oracle/Database.cpp b/source/dbms.oracle/Database.cpp index 276d143..2ff1553 100644 --- a/source/dbms.oracle/Database.cpp +++ b/source/dbms.oracle/Database.cpp @@ -1,37 +1,9 @@ -// ANNA - Anna is Not Nothingness Anymore -// -// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo -// -// https://bitbucket.org/testillano/anna -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Authors: eduardo.ramos.testillano@gmail.com -// cisco.tierra@gmail.com +// ANNA - Anna is Not Nothingness Anymore // +// // +// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo // +// // +// See project site at http://redmine.teslayout.com/projects/anna-suite // +// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE // #include @@ -65,9 +37,8 @@ oracle::Database::Database(const char* componentName, const char* dbmsName) : } void oracle::Database::do_initialize() -throw(RuntimeException) { +noexcept(false) { LOGMETHOD(TraceMethod tm("anna::dbms::oracle::Database", "do_initialize", ANNA_FILE_LOCATION)); - int status; if(a_env != NULL) { Logger::write(Logger::Warning, asString(), "Already initialized", ANNA_FILE_LOCATION); @@ -118,32 +89,32 @@ oracle::Database::~Database() { } dbms::Connection* oracle::Database::allocateConnection(const std::string& name, const char* user, const char* password) -throw(RuntimeException) { +noexcept(false) { return new Connection(*this, name, user, password); } dbms::Statement* oracle::Database::allocateStatement(const char* name, const std::string& expression, const bool isCritical) -throw(RuntimeException) { +noexcept(false) { return new Statement(*this, name, expression, isCritical); } dbms::InputBind* oracle::Database::allocateInputBind(const char* name, Data& data) -throw(RuntimeException) { +noexcept(false) { return new InputBind(name, data); } void oracle::Database::deallocate(dbms::InputBind* inputBind) -throw() { +{ delete(InputBind*) inputBind; } dbms::OutputBind* oracle::Database::allocateOutputBind(const char* name, Data& data) -throw(RuntimeException) { +noexcept(false) { return new OutputBind(name, data); } void oracle::Database::deallocate(dbms::OutputBind* outputBind) -throw() { +{ delete(OutputBind*) outputBind; } @@ -157,7 +128,7 @@ throw() { */ /*static*/ void oracle::Database::initializeDecimalPoint() -throw(RuntimeException) { +noexcept(false) { setlocale(LC_NUMERIC, ""); struct lconv *locale = localeconv();