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

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.cc (modified) (3 diffs, 1 prop)

code/trunk/src/util/Exception.cc

@@ -38 +38 @@
 {
     Exception::Exception(const std::string& description, int lineNumber,
-                         const char* fileName, const char* functionName)
+                         const char* filename, const char* functionName)
         : description_(description)
         , lineNumber_(lineNumber)
         , functionName_(functionName)
-        , fileName_(fileName)
+        , filename_(filename)
     { }
 
@@ -49 +49 @@
         , lineNumber_(0)
         , functionName_("")
-        , fileName_("")
+        , filename_("")
     { }
 
@@ -60 +60 @@
             fullDesc << this->getTypeName() << "_EXCEPTION";
 
-            if (this->fileName_ != "")
+            if (this->filename_ != "")
             {
-                fullDesc << " in " << this->fileName_;
+                fullDesc << " in " << this->filename_;
                 if (this->lineNumber_)
                     fullDesc << "(" << this->lineNumber_ << ")";