diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
commit | 73d90aa9dd87986dc2ef8f39db346b71c58b181b (patch) | |
tree | a2ec930f732aaed7d7addbb22bb34b15c78d408b /indra/llcommon/llkeybind.h | |
parent | 8e70575be833cf2056b1ceef7ef842cbc7700ce0 (diff) | |
parent | e80f0f331dbfca686e0a80c557e9b1e455c8d167 (diff) |
SL-18837: Merge branch 'DRTVWR-587-maint-V' into rm-cxxstd.
Diffstat (limited to 'indra/llcommon/llkeybind.h')
-rw-r--r-- | indra/llcommon/llkeybind.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llkeybind.h b/indra/llcommon/llkeybind.h index c6b4bd970f..488f509411 100644 --- a/indra/llcommon/llkeybind.h +++ b/indra/llcommon/llkeybind.h @@ -95,11 +95,13 @@ public: void clear() { mData.clear(); } // if there any empty LLKeyData in the end of the array, remove them void trimEmpty(); - U32 getDataCount(); + size_t getDataCount(); private: typedef std::vector<LLKeyData> data_vector_t; data_vector_t mData; + + data_vector_t::const_iterator endNonEmpty() const; }; |