dtinfo subtree DtMmdb

cde/programs/dtinfo/DtMmdb/dti_excs/Exceptions.C

@@ -43,42 +43,47 @@ char* Exceptions::f_msg_out_of_exception_memory = 0;
 char* Exceptions::f_msg_out_of_obj_stack_memory = 0;
 char* Exceptions::f_msg_memory_already_freed = 0;
 #else
-char *Exceptions::f_msg_internal_error =     "Internal exceptions error:";
-char *Exceptions::f_msg_application_error =  "Application exceptions error:";
-char *Exceptions::f_msg_throw_message =      "Application threw exception:";
+char *Exceptions::f_msg_internal_error =
+  (char*)"Internal exceptions error:";
+
+char *Exceptions::f_msg_application_error =
+  (char*)"Application exceptions error:";
+
+char *Exceptions::f_msg_throw_message =
+  (char*)"Application threw exception:";
 
 char *Exceptions::f_msg_not_initialized =
-  "Exceptions library not initialized with INIT_EXCEPTIONS().";
+  (char*)"Exceptions library not initialized with INIT_EXCEPTIONS().";
 
 char *Exceptions::f_msg_initialized_twice =
-  "Attept to call INIT_EXCEPTIONS() more than once.";
+  (char*)"Attept to call INIT_EXCEPTIONS() more than once.";
   
 char *Exceptions::f_msg_not_caught =
-  "Exception not caught.";
+  (char*)"Exception not caught.";
 
 char *Exceptions::f_msg_no_current_exception =
-  "There is no current exception (for catch or rethrow).";
+  (char*)"There is no current exception (for catch or rethrow).";
 
 char *Exceptions::f_msg_throw_from_terminate =
-  "Exceptions may not be thrown from terminate.";
+  (char*)"Exceptions may not be thrown from terminate.";
 
 char *Exceptions::f_msg_throw_from_error_handler =
-  "Exceptions may not be thrown from error handler.";
+  (char*)"Exceptions may not be thrown from error handler.";
 
 char *Exceptions::f_msg_throw_from_destructor =
-  "Exited destructor with throw while handling an exception.";
+  (char*)"Exited destructor with throw while handling an exception.";
 
 char *Exceptions::f_msg_throw_ptr_to_stack =
-  "Threw a pointer to an automatic (stack-based) exceptions object.";
+  (char*)"Threw a pointer to an automatic (stack-based) exceptions object.";
 
 char *Exceptions::f_msg_out_of_exception_memory =
-  "Not enough memory to allocate an exception object.";
+  (char*)"Not enough memory to allocate an exception object.";
 
 char *Exceptions::f_msg_out_of_obj_stack_memory =
-  "Not enough memory to allocate object stack.";
+  (char*)"Not enough memory to allocate object stack.";
 
 char *Exceptions::f_msg_memory_already_freed =
-  "Tried to alloc or realloc pool memory that was previously freed.";
+  (char*)"Tried to alloc or realloc pool memory that was previously freed.";
 
 #endif
 
@@ -183,7 +188,7 @@ Exceptions::error (const char *message, error_type_t error_type)
   // Call user print function if set, otherwise just dump lines.
   if (g_error_handler != NULL)
     {
-      try
+      mtry
 	{
 	  // Reset global variable to NULL before calling to prevent
 	  // the possibility of recursive calls. 
@@ -191,7 +196,7 @@ Exceptions::error (const char *message, error_type_t error_type)
 	  (*current) ((const char**)lines, count);
 	  set_error_handler (current);
 	}
-      catch_any()
+      mcatch_any()
 	{
 	  // Error handler will be NULL at this point. 
 	  Exceptions::error (Exceptions::f_msg_throw_from_error_handler,