瀏覽代碼

build on Irix

David Rose 20 年之前
父節點
當前提交
c627c273a3
共有 2 個文件被更改,包括 1 次插入3 次删除
  1. 0 2
      panda/src/gobj/qpgeomVertexColumn.cxx
  2. 1 1
      panda/src/gobj/sliderTable.cxx

+ 0 - 2
panda/src/gobj/qpgeomVertexColumn.cxx

@@ -548,14 +548,12 @@ get_data1i(const unsigned char *pointer) {
       PN_uint32 dword = *(const PN_uint32 *)pointer;
       return qpGeomVertexData::unpack_abcd_d(dword);
     }
-    break;
 
   case NT_packed_dabc:
     {
       PN_uint32 dword = *(const PN_uint32 *)pointer;
       return qpGeomVertexData::unpack_abcd_b(dword);
     }
-    break;
 
   case NT_float32:
     return (int)*(const PN_float32 *)pointer;

+ 1 - 1
panda/src/gobj/sliderTable.cxx

@@ -237,7 +237,7 @@ complete_pointers(TypedWritable **p_list, BamReader *manager) {
 
     (*si) = slider;
 
-    bool inserted = _sliders_by_name.insert(SlidersByName::value_type(name, slider)).second;
+    bool inserted = _sliders_by_name.insert(SlidersByName::value_type(name, slider.p())).second;
     nassertr(inserted, pi);
   }