From: Foster B. <fos...@us...> - 2006-02-03 18:21:27
|
Update of /cvsroot/adobe-source/adobe-source/adobe/test/begin/sources In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1031/adobe/test/begin/sources Modified Files: express_viewer.cpp report_exception.cpp Log Message: asl 1.0.13 Index: report_exception.cpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/begin/sources/report_exception.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** report_exception.cpp 6 Jan 2006 18:35:24 -0000 1.2 --- report_exception.cpp 3 Feb 2006 18:20:47 -0000 1.3 *************** *** 1,73 **** /* ! Copyright 2005-2006 Adobe Systems Incorporated ! Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt ! or a copy at http://opensource.adobe.com/licenses.html) */ /****************************************************************************************************/ ! #include "report_exception.hpp" ! ! #include <cassert> ! ! #ifndef NDEBUG ! #include <iostream> ! #endif ! ! /****************************************************************************************************/ ! ! namespace { ! ! /****************************************************************************************************/ ! ! inline adobe::report_exception_proc_t& report_exception_proc() ! { ! static adobe::report_exception_proc_t report_exception_proc_s; ! ! return report_exception_proc_s; ! } ! ! /****************************************************************************************************/ ! ! } // namespace ! ! /****************************************************************************************************/ ! ! namespace adobe { ! ! /****************************************************************************************************/ ! ! namespace implementation { ! ! /****************************************************************************************************/ ! ! void report_exception(const std::string& error_message) ! { ! if (report_exception_proc()) ! { ! report_exception_proc()(error_message); ! } ! #ifndef NDEBUG ! else ! { ! std::cerr << error_message << std::endl; ! } ! #endif ! } ! ! /****************************************************************************************************/ ! ! } // namespace implementation ! ! /****************************************************************************************************/ ! ! void set_report_exception_callback(boost::function<void (const std::string& msg)> proc) ! { ! report_exception_proc() = proc; ! } ! ! /****************************************************************************************************/ ! ! } // namespace adobe ! ! /****************************************************************************************************/ --- 1,9 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated ! Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt ! or a copy at http://opensource.adobe.com/licenses.html) */ /****************************************************************************************************/ ! // This file intentionally left blank Index: express_viewer.cpp =================================================================== RCS file: /cvsroot/adobe-source/adobe-source/adobe/test/begin/sources/express_viewer.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** express_viewer.cpp 6 Jan 2006 18:35:24 -0000 1.7 --- express_viewer.cpp 3 Feb 2006 18:20:47 -0000 1.8 *************** *** 1,6 **** /* ! Copyright 2005-2006 Adobe Systems Incorporated ! Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt ! or a copy at http://opensource.adobe.com/licenses.html) */ --- 1,6 ---- /* ! Copyright 2005-2006 Adobe Systems Incorporated ! Distributed under the MIT License (see accompanying file LICENSE_1_0_0.txt [...1125 lines suppressed...] ! system_beep(); } --- 633,647 ---- void application_t::display_error( const std::string& msg ) { ! if (_editor_sheet_m) ! { ! _editor_sheet_m->set( editor_error_cell_g, adobe::value_t( msg ) ); ! _editor_sheet_m->set( editor_visible_tab_cell_g, adobe::value_t( editor_key_errors_tab_g ) ); ! _editor_sheet_m->update(); ! } #ifndef NDEBUG ! else std::cerr << msg << std::endl; #endif ! system_beep(); } |