[mapguide-commits] r4750 - trunk/MgDev/Oem/SQLite/src/Exceptions
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Wed Apr 7 13:21:33 EDT 2010
Author: brucedechant
Date: 2010-04-07 13:21:32 -0400 (Wed, 07 Apr 2010)
New Revision: 4750
Modified:
trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.h
trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.cpp
trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.h
Log:
Fix for trac ticket 1290 - Update PHP extensions to support PHP 5.3
http://trac.osgeo.org/mapguide/ticket/1290
Notes:
- Change API GetMessage() to GetExceptionMessage() due to PHP conflict
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING CantCloseDbException::GetMessage() throw()
+STRING CantCloseDbException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Cannot close database file.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/CantCloseDbException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(CantCloseDbException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING CantOpenDbException::GetMessage() throw()
+STRING CantOpenDbException::GetExceptionMessage() throw()
{
return L"Cannot Open database";
}
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/CantOpenDbException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(CantOpenDbException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING ColumnNotFoundException::GetMessage() throw()
+STRING ColumnNotFoundException::GetExceptionMessage() throw()
{
STRING wsMessage = L"The specified column was not found.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/ColumnNotFoundException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(ColumnNotFoundException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING ExecuteErrorException::GetMessage() throw()
+STRING ExecuteErrorException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Error executing a query.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/ExecuteErrorException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(ExecuteErrorException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING InvalidArgumentException::GetMessage() throw()
+STRING InvalidArgumentException::GetExceptionMessage() throw()
{
STRING wsMessage = L"The argument supplied is invalid.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/InvalidArgumentException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(InvalidArgumentException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING NoDbConnectionException::GetMessage() throw()
+STRING NoDbConnectionException::GetExceptionMessage() throw()
{
STRING wsMessage = L"No connection to database detected.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/NoDbConnectionException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(NoDbConnectionException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING OutOfMemoryException::GetMessage() throw()
+STRING OutOfMemoryException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Out of memory.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/OutOfMemoryException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(OutOfMemoryException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING SQLiteFinalizeException::GetMessage() throw()
+STRING SQLiteFinalizeException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Error while finalizing virtual machine.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteFinalizeException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(SQLiteFinalizeException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING SQLitePrepareException::GetMessage() throw()
+STRING SQLitePrepareException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Error while creating virtual machine.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SQLitePrepareException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(SQLitePrepareException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING SQLiteVMConstructException::GetMessage() throw()
+STRING SQLiteVMConstructException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Error constructing virtual machine.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SQLiteVMConstructException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(SQLiteVMConstructException)
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -34,7 +34,7 @@
}
-STRING SqliteException::GetMessage() throw()
+STRING SqliteException::GetExceptionMessage() throw()
{
return m_message;
}
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/SqliteException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -18,11 +18,6 @@
#ifndef _SQLITE_EXCEPTION_H_
#define _SQLITE_EXCEPTION_H_
-// To undefine GetMessage macro defined in windows
-#ifdef WIN32
- #undef GetMessage
-#endif
-
#define DECLARE_EXCEPTION_ABSTRACT(className) \
virtual INT32 GetClassId(); \
virtual void Raise() = 0; \
@@ -53,7 +48,7 @@
/// <returns>
/// Localized exception message
/// </returns>
- virtual STRING GetMessage() throw();
+ virtual STRING GetExceptionMessage() throw();
INTERNAL_API:
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.cpp 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.cpp 2010-04-07 17:21:32 UTC (rev 4750)
@@ -42,7 +42,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
-STRING TypeMismatchException::GetMessage() throw()
+STRING TypeMismatchException::GetExceptionMessage() throw()
{
STRING wsMessage = L"Type mismatch.\n";
return wsMessage;
Modified: trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.h 2010-04-07 17:16:24 UTC (rev 4749)
+++ trunk/MgDev/Oem/SQLite/src/Exceptions/TypeMismatchException.h 2010-04-07 17:21:32 UTC (rev 4750)
@@ -45,7 +45,7 @@
/// <param name="nLocale">The locale identifier to format the message text.</param>
/// </summary>
///
- STRING GetMessage() throw();
+ STRING GetExceptionMessage() throw();
INTERNAL_API:
DECLARE_EXCEPTION_DEFAULTS(TypeMismatchException)
More information about the mapguide-commits
mailing list