moved two common methods to base class

ITpC · Aug 20, 2018 · 099122a · 099122a
1 parent b8dce40
commit 099122a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/include/WSStreamParser.h b/include/WSStreamParser.h
@@ -423,8 +423,20 @@ namespace WSStreamProcessing
       };
     }
 
-
-
+    auto getBuffer()
+    {
+      AtomicLock sync(mBQMutex);
+      if(mBufferQueue.empty())
+      {
+        return std::make_shared<MSGBufferType>(mOutMSGPreSize);
+      }else{
+        auto tmp=std::move(mBufferQueue.front());
+        tmp->resize(mOutMSGPreSize);
+        mBufferQueue.pop();
+        return tmp;
+      }
+    }
+
    public:
     explicit WSStreamParser(const size_t& presz)
     : mPLBytesReady{0},cursor{0},mMaxMSGSize{0},
@@ -439,6 +451,12 @@ namespace WSStreamProcessing
     WSStreamParser(const WSStreamParser&)=delete;
     WSStreamParser(WSStreamParser&)=delete;
 
+    void returnBuffer(std::remove_reference<const std::shared_ptr<MSGBufferType>&>::type buff)
+    {
+      AtomicLock sync(mBQMutex);
+      mBufferQueue.push(std::move(buff));
+    }
+
     void setMaxMSGSize(const size_t& mms)
     {
       mMaxMSGSize=mms;

diff --git a/include/WSStreamServerParser.h b/include/WSStreamServerParser.h
@@ -286,26 +286,9 @@ namespace WSStreamProcessing
       throw std::logic_error("WSStreamParser::decideOnDone() switch is out of options, never should have happened. Blame the programmer");
     }
 
-    auto getBuffer()
-    {
-      AtomicLock sync(mBQMutex);
-      if(mBufferQueue.empty())
-      {
-        return std::make_shared<MSGBufferType>(mOutMSGPreSize);
-      }else{
-        auto tmp=std::move(mBufferQueue.front());
-        tmp->resize(mOutMSGPreSize);
-        mBufferQueue.pop();
-        return tmp;
-      }
-    }
   public:
-    void returnBuffer(std::remove_reference<const std::shared_ptr<MSGBufferType>&>::type buff)
-    {
-      AtomicLock sync(mBQMutex);
-      mBufferQueue.push(std::move(buff));
-    }
-    const Result parse(const uint8_t* stream, const size_t& limit, const size_t& offset)
+
+   const Result parse(const uint8_t* stream, const size_t& limit, const size_t& offset)
     {
       cursor=offset;