diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-19 16:01:20 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-08-19 16:01:20 +0100 |
| commit | 898dfdb52d24701bb2e51fd783c91721c0f5f40e (patch) | |
| tree | a16c783a4f49dd6be78aa3ac49782cbe0c9a3311 /indra/llcommon/llapr.h | |
| parent | 7e37263fc5cb93e31727b2e3243f2221ed1f8cad (diff) | |
| parent | e8b31d03b4f6f0ffb981b4ea150743daf7b4a958 (diff) | |
Merge remote-tracking branch 'origin/master' into SL-12995
Diffstat (limited to 'indra/llcommon/llapr.h')
| -rw-r--r-- | indra/llcommon/llapr.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/llcommon/llapr.h b/indra/llcommon/llapr.h index 3c07976f42..255b50c8d0 100644 --- a/indra/llcommon/llapr.h +++ b/indra/llcommon/llapr.h @@ -170,9 +170,6 @@ public: S32 write(const void* buf, S32 nbytes); apr_file_t* getFileHandle() {return mFile;} - -private: - apr_pool_t* getAPRFilePool(apr_pool_t* pool) ; // //******************************************************************************************************************************* @@ -182,8 +179,8 @@ public: static LLVolatileAPRPool *sAPRFilePoolp ; //a global apr_pool for APRFile, which is used only when local pool does not exist. private: - static apr_file_t* open(const std::string& filename, LLVolatileAPRPool* pool, apr_int32_t flags); - static apr_status_t close(apr_file_t* file, LLVolatileAPRPool* pool) ; + static apr_file_t* open(const std::string& filename, apr_pool_t* apr_pool, apr_int32_t flags); + static apr_status_t close(apr_file_t* file) ; static S32 seek(apr_file_t* file, apr_seek_where_t where, S32 offset); public: // returns false if failure: |