diff options
Diffstat (limited to 'dev/ZKA/NewKit')
| -rw-r--r-- | dev/ZKA/NewKit/Array.hxx | 12 | ||||
| -rw-r--r-- | dev/ZKA/NewKit/NewKit.hxx | 1 | ||||
| -rw-r--r-- | dev/ZKA/NewKit/Ref.hxx | 2 |
3 files changed, 11 insertions, 4 deletions
diff --git a/dev/ZKA/NewKit/Array.hxx b/dev/ZKA/NewKit/Array.hxx index dcb6aede..22ee9f6a 100644 --- a/dev/ZKA/NewKit/Array.hxx +++ b/dev/ZKA/NewKit/Array.hxx @@ -37,9 +37,17 @@ namespace Kernel return true; } - SizeT Count() const + const SizeT Count() { - return N; + SizeT count = 0; + + for (SizeT i = 0; i < N; i++) + { + if (fArray[i]) + ++count; + } + + return count; } const T* CData() diff --git a/dev/ZKA/NewKit/NewKit.hxx b/dev/ZKA/NewKit/NewKit.hxx index e7766bde..1daa6af2 100644 --- a/dev/ZKA/NewKit/NewKit.hxx +++ b/dev/ZKA/NewKit/NewKit.hxx @@ -18,5 +18,4 @@ #include <NewKit/OwnPtr.hxx> #include <NewKit/Ref.hxx> #include <NewKit/Stream.hxx> -#include <KernelKit/ProcessHeap.hxx> #include <NewKit/Utils.hxx> diff --git a/dev/ZKA/NewKit/Ref.hxx b/dev/ZKA/NewKit/Ref.hxx index f23cfc08..41f003be 100644 --- a/dev/ZKA/NewKit/Ref.hxx +++ b/dev/ZKA/NewKit/Ref.hxx @@ -37,7 +37,7 @@ namespace Kernel } public: - T& operator->() const + T operator->() const { MUST_PASS(*fClass); return *fClass; |