diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 22:30:28 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-12-03 22:30:28 +0200 |
| commit | 3021e1959ec32192e03e8e210db4b174250c87e2 (patch) | |
| tree | 19eb7557666b6871cef246bb23085665465021f8 /indra/llcorehttp/bufferstream.h | |
| parent | 29518cdf4a9e3c9ee214d358bcc1e8f1c3fd6c93 (diff) | |
| parent | 189ffd46e0316e333bc850f69eb7ed57dd7829e7 (diff) | |
Merge branch 'develop-linux' into marchcat/slua-linux
# Conflicts:
# indra/newview/llfeaturemanager.cpp
Diffstat (limited to 'indra/llcorehttp/bufferstream.h')
| -rw-r--r-- | indra/llcorehttp/bufferstream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/bufferstream.h b/indra/llcorehttp/bufferstream.h index 93891810aa..ba84821df3 100644 --- a/indra/llcorehttp/bufferstream.h +++ b/indra/llcorehttp/bufferstream.h @@ -91,8 +91,8 @@ public: virtual ~BufferArrayStreamBuf(); private: - BufferArrayStreamBuf(const BufferArrayStreamBuf &); // Not defined - void operator=(const BufferArrayStreamBuf &); // Not defined + BufferArrayStreamBuf(const BufferArrayStreamBuf&) = delete; + void operator=(const BufferArrayStreamBuf&) = delete; public: // Input interfaces from std::streambuf |