Changeset 6ac5223 for src/Common/utility.h

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Common/utility.h (modified) (3 diffs)

src/Common/utility.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 21 22:19:13 2017
-// Update Count     : 33
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 17 11:38:00 2017
+// Update Count     : 34
 //
 
@@ -27 +27 @@
 
 #include <cassert>
+
 template< typename T >
 static inline T * maybeClone( const T *orig ) {
@@ -340 +341 @@
 }
 
-struct CodeLocation {
-        int linenumber;
-        std::string filename;
-
-        /// Create a new unset CodeLocation.
-        CodeLocation()
-                : linenumber( -1 )
-                , filename("")
-        {}
-
-        /// Create a new CodeLocation with the given values.
-        CodeLocation( const char* filename, int lineno )
-                : linenumber( lineno )
-                , filename(filename ? filename : "")
-        {}
-
-        CodeLocation( const CodeLocation& rhs ) = default;
-
-        bool isSet () const {
-                return -1 != linenumber;
-        }
-
-        bool isUnset () const {
-                return !isSet();
-        }
-
-        void unset () {
-                linenumber = -1;
-                filename = "";
-        }
-
-        // Use field access for set.
-};
-
-inline std::string to_string( const CodeLocation& location ) {
-        return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
-}
-
 // Local Variables: //
 // tab-width: 4 //