--- libgig/trunk/src/Serialization.cpp	2017/05/03 19:13:26	3145
+++ libgig/trunk/src/Serialization.cpp	2017/05/03 19:54:08	3146
@@ -557,7 +557,7 @@
         return chain;
     }
 
-    Member _popMemberBlob(const char*& p, const char* end) {
+    static Member _popMemberBlob(const char*& p, const char* end) {
         _Blob blob = _decodeBlob(p, end, false);
         p   = blob.p;
         end = blob.end;
@@ -571,7 +571,7 @@
         m.m_type   = _popDataTypeBlob(p, end);
         assert(m.type());
         assert(!m.name().empty());
-        assert(m.uid() != NULL);
+        assert(m.uid().isValid());
         return m;
     }
 
@@ -591,7 +591,7 @@
         return members;
     }
 
-    void _popPrimitiveValue(const char*& p, const char* end, Object& obj) {
+    static void _popPrimitiveValue(const char*& p, const char* end, Object& obj) {
         const DataType& type = obj.type();
         if (type.isPrimitive() && !type.isPointer()) {
             obj.m_data.resize(type.size());
@@ -640,7 +640,7 @@
         }
     }
 
-    Object _popObjectBlob(const char*& p, const char* end) {
+    static Object _popObjectBlob(const char*& p, const char* end) {
         _Blob blob = _decodeBlob(p, end, false);
         p   = blob.p;
         end = blob.end;