Browse Source

Merge pull request #947 from ghalliday/jlibpop

Fix incorrect pop functions in jlib template class

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 13 years ago
parent
commit
6731380a54
1 changed files with 2 additions and 2 deletions
  1. 2 2
      system/jlib/jlib.hpp

+ 2 - 2
system/jlib/jlib.hpp

@@ -165,7 +165,7 @@ class ICopyArrayOf : public CopyArray
 {
 public:
     inline TYPE & item(aindex_t pos) const        { return (TYPE &)CopyArray::item(pos); }
-    inline TYPE & pop(bool nodel = 0)             { return (TYPE &)CopyArray::pop(); }
+    inline TYPE & pop()                           { return (TYPE &)CopyArray::pop(); }
     inline TYPE & tos(void) const                 { return (TYPE &)CopyArray::tos(); }
     inline TYPE & tos(aindex_t num) const         { return (TYPE &)CopyArray::tos(num); }
     inline TYPE **getArray(aindex_t pos = 0)      { return (TYPE **)CopyArray::getArray(pos); }
@@ -206,7 +206,7 @@ public:
     inline aindex_t find(TYPE * x) const        { return PointerArray::find(x); }
     inline TYPE **getArray(aindex_t pos = 0)    { return (TYPE **)PointerArray::getArray(pos); }
     inline TYPE * item(aindex_t pos) const      { return (TYPE *)PointerArray::item(pos); }
-    inline TYPE * pop(bool nodel = 0)           { return (TYPE *)PointerArray::pop(nodel); }
+    inline TYPE * pop()                         { return (TYPE *)PointerArray::pop(); }
     inline void replace(TYPE * x, aindex_t pos) { PointerArray::replace(x, pos); }
     inline TYPE * tos(void) const               { return (TYPE *)PointerArray::tos(); }
     inline TYPE * tos(aindex_t num) const       { return (TYPE *)PointerArray::tos(num); }