Skip to content

Commit a0a6664

Browse files
Merge branch 'develop' into feature/CHAI-44-debug-range-check
2 parents 908df3f + 5a1f8b1 commit a0a6664

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

src/ArrayManager.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,16 @@ class ArrayManager
198198
*/
199199
void resetTouch(PointerRecord* pointer_record);
200200

201+
/*!
202+
* \brief Find the PointerRecord corresponding to the raw pointer.
203+
*
204+
* \param pointer Raw pointer to find the PointerRecord for.
205+
*
206+
* \return PointerRecord containing the raw pointer, or an empty
207+
* PointerRecord if none found.
208+
*/
209+
PointerRecord* getPointerRecord(void* pointer);
210+
201211
protected:
202212

203213
/*!
@@ -251,16 +261,6 @@ class ArrayManager
251261
*/
252262
void move(PointerRecord* record, ExecutionSpace space);
253263

254-
/*!
255-
* \brief Find the PointerRecord corresponding to the raw pointer.
256-
*
257-
* \param pointer Raw pointer to find the PointerRecord for.
258-
*
259-
* \return PointerRecord containing the raw pointer, or an empty
260-
* PointerRecord if none found.
261-
*/
262-
PointerRecord* getPointerRecord(void* pointer);
263-
264264
/*!
265265
* Pointer to singleton instance.
266266
*/

src/ManagedArray.inl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ CHAI_HOST_DEVICE ManagedArray<T>::ManagedArray(ManagedArray const& other):
119119
*/
120120
if (!std::is_const<T>::value) {
121121
CHAI_LOG("ManagedArray", "T is non-const, registering touch of pointer" << m_active_pointer);
122-
// T_non_const* non_const_pointer = const_cast<T_non_const*>(m_active_pointer);
123122
m_resource_manager->registerTouch(m_pointer_record);
124123
}
125124
#endif

0 commit comments

Comments
 (0)