summaryrefslogtreecommitdiff
path: root/trace_model.cpp
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-04-06 11:57:49 +0100
committerJosé Fonseca <jfonseca@vmware.com>2011-04-07 14:44:19 +0100
commiteedfe5a7d250dec744ddac8044dffee97f0a41b3 (patch)
tree4cbd862f660bc0e4e03c66d8a804dae5661f7c43 /trace_model.cpp
parentc2d9f8a4ab2e4b555b918d47fe3313f862009e4d (diff)
Fix warnings from incomplete copy'n'paste.
Diffstat (limited to 'trace_model.cpp')
-rw-r--r--trace_model.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/trace_model.cpp b/trace_model.cpp
index 8821417..c74aaae 100644
--- a/trace_model.cpp
+++ b/trace_model.cpp
@@ -77,7 +77,7 @@ Pointer::operator bool(void) const { return value != 0; }
// signed integer cast
-Value ::operator signed long long (void) const { assert(0); return NULL; }
+Value ::operator signed long long (void) const { assert(0); return 0; }
Null ::operator signed long long (void) const { return 0; }
Bool ::operator signed long long (void) const { return static_cast<signed long long>(value); }
SInt ::operator signed long long (void) const { return value; }
@@ -87,7 +87,7 @@ Enum ::operator signed long long (void) const { return static_cast<signed long
// unsigned integer cast
-Value ::operator unsigned long long (void) const { assert(0); return NULL; }
+Value ::operator unsigned long long (void) const { assert(0); return 0; }
Null ::operator unsigned long long (void) const { return 0; }
Bool ::operator unsigned long long (void) const { return static_cast<unsigned long long>(value); }
SInt ::operator unsigned long long (void) const { assert(value >= 0); return static_cast<signed long long>(value); }
@@ -97,7 +97,7 @@ Enum ::operator unsigned long long (void) const { return static_cast<unsigned
// floating point cast
-Value ::operator double (void) const { assert(0); return NULL; }
+Value ::operator double (void) const { assert(0); return 0; }
Null ::operator double (void) const { return 0; }
Bool ::operator double (void) const { return static_cast<double>(value); }
SInt ::operator double (void) const { return static_cast<double>(value); }