Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 4 deletions

diff --git a/utils/null_traits.h b/utils/null_traits.h
index fac857d9..7b2d32d0 100644
--- a/utils/null_traits.h
+++ b/utils/null_traits.h
@@ -3,23 +3,23 @@
 
 template <class V>
 struct null_traits {
-  static V null; //TODO: maybe take out default null and make ppl explicitly define?  they may be surprised that they need to when they include a header lib that uses null_traits
+  static V xnull; //TODO: maybe take out default null and make ppl explicitly define?  they may be surprised that they need to when they include a header lib that uses null_traits
 };
 // global bool is_null(V const& v)
 
 // definitely override this, and possibly set_null and is_null.  that's the point.
 template <class V>
-V null_traits<V>::null;
+V null_traits<V>::xnull;
 //TODO: are we getting single init of the static null object?
 
 template <class V>
 void set_null(V &v) {
-  v=null_traits<V>::null;
+  v=null_traits<V>::xnull;
 }
 
 template <class V>
 void is_null(V const& v) {
-  return v==null_traits<V>::null;
+  return v==null_traits<V>::xnull;
 }