Changeset 2103 for code/trunk/src/util/Exception.h

Timestamp:

Nov 2, 2008, 12:22:42 AM (17 years ago)

Author:

rgrieder

Message:

Merged r2101 (objecthierarchy) to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.h (modified) (3 diffs, 1 prop)

code/trunk/src/util/Exception.h

@@ -67 +67 @@
 
         Exception(const std::string& description, int lineNumber,
-                  const char* fileName, const char* functionName);
+                  const char* filename, const char* functionName);
         Exception(const std::string& description);
 
@@ -87 +87 @@
         int lineNumber_;
         std::string functionName_;
-        std::string fileName_;
+        std::string filename_;
         // mutable because "what()" is a const method
         mutable std::string fullDescription_;
@@ -98 +98 @@
     public:
         SpecificException(const std::string& description, int lineNumber,
-                  const char* fileName, const char* functionName)
-                  : Exception(description, lineNumber, fileName, functionName)
+                  const char* filename, const char* functionName)
+                  : Exception(description, lineNumber, filename, functionName)
         {
             // let the catcher decide whether to display the message below level 4