move semantics, clang++ warnings fix

ITpC · Jun 16, 2019 · 44a0d82 · 44a0d82
1 parent 726a075
commit 44a0d82
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 28 deletions.
diff --git a/include/ServiceRegistry.h b/include/ServiceRegistry.h
@@ -132,7 +132,7 @@ namespace LAppS
         }
         retobj->push_back(j);
       }
-      return std::move(retobj);
+      return retobj;
     }
 
     void clear()
@@ -249,7 +249,7 @@ namespace LAppS
       {
         retobj->push_back(std::move(*(instances.second.list())));
       }
-      return std::move(retobj);
+      return retobj;
     }
   };
   using SServiceRegistry=itc::Singleton<ServiceRegistry>;

diff --git a/include/WSStreamClientParser.h b/include/WSStreamClientParser.h
@@ -206,18 +206,18 @@ namespace WSStreamProcessing
           reset();
         case WSStreamProcessing::State::HEADER_1ST_BYTE:
         {
-          auto result=std::move(getHeader1stByte(stream,limit,cursor));
+          auto result{getHeader1stByte(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::CONTINUE )
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::HEADER_2DN_BYTE:
         {
-          auto result=std::move(getHeader2ndByte(stream,limit,cursor));
+          auto result{getHeader2ndByte(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::READ_SHORT_SIZE_0:
@@ -231,10 +231,10 @@ namespace WSStreamProcessing
         case WSStreamProcessing::State::READ_LONG_SIZE_6:
         case WSStreamProcessing::State::READ_LONG_SIZE_7:
         {
-          auto result=std::move(readSIZE(stream,limit,cursor));
+          auto result{readSIZE(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::READ_MASK_0:
@@ -244,22 +244,22 @@ namespace WSStreamProcessing
           mState=WSStreamProcessing::State::VALIDATE;
         case WSStreamProcessing::State::VALIDATE:
         {
-          auto result=std::move(validateHeader());
+          auto result{validateHeader()};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::PAYLOAD:
         {
-          auto result=std::move(processPayload(stream,limit,cursor));
+          auto result{processPayload(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::DONE:
-          return std::move(decideOnDone(stream,limit,cursor));
+          return decideOnDone(stream,limit,cursor);
         default:
           throw std::logic_error("WSStreamParser::parse() - switch case is out of options. Never should have happened. Blame the programmer");
       }

diff --git a/include/WSStreamServerParser.h b/include/WSStreamServerParser.h
@@ -337,18 +337,18 @@ namespace WSStreamProcessing
           reset();
         case WSStreamProcessing::State::HEADER_1ST_BYTE:
         {
-          auto result=std::move(getHeader1stByte(stream,limit,cursor));
+          auto result{getHeader1stByte(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::CONTINUE )
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::HEADER_2DN_BYTE:
         {
-          auto result=std::move(getHeader2ndByte(stream,limit,cursor));
+          auto result{getHeader2ndByte(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::READ_SHORT_SIZE_0:
@@ -362,41 +362,41 @@ namespace WSStreamProcessing
         case WSStreamProcessing::State::READ_LONG_SIZE_6:
         case WSStreamProcessing::State::READ_LONG_SIZE_7:
         {
-          auto result=std::move(readSIZE(stream,limit,cursor));
+          auto result{readSIZE(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::READ_MASK_0:
         case WSStreamProcessing::State::READ_MASK_1:
         case WSStreamProcessing::State::READ_MASK_2:
         case WSStreamProcessing::State::READ_MASK_3:
         {
-          auto result=std::move(readMASK(stream,limit,cursor));
+          auto result{readMASK(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::VALIDATE:
         {
-          auto result=std::move(validateHeader());
+          auto result{validateHeader()};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::PAYLOAD:
         {
-          auto result=std::move(processPayload(stream,limit,cursor));
+          auto result{processPayload(stream,limit,cursor)};
           if(result.directive != WSStreamProcessing::Directive::CONTINUE)
           {
-            return std::move(result);
+            return result;
           }
         }
         case WSStreamProcessing::State::DONE:
-          return std::move(decideOnDone(stream,limit,cursor));
+          return decideOnDone(stream,limit,cursor);
         default:
           throw std::logic_error("WSStreamParser::parse() - switch case is out of options. Never should have happened. Blame the programmer");
       }

diff --git a/include/modules/mqr.h b/include/modules/mqr.h
@@ -155,7 +155,7 @@ extern "C" {
             auto udjsptr=static_cast<UDJSPTR**>(lua_newuserdata(L,sizeof(UDJSPTR*)));
             (*udjsptr)=new UDJSPTR(SHARED_PTR,new JSPTR());
 
-            if(queue->tryRecv(*((*udjsptr)->ptr)))
+            if(queue->try_recv(*((*udjsptr)->ptr)))
             {
               luaL_getmetatable(L, "nljson");
               lua_pushcfunction(L, destroy_nljson_object);
@@ -207,7 +207,7 @@ extern "C" {
           try{
             auto udjsptr=static_cast<UDJSPTR**>(lua_newuserdata(L,sizeof(UDJSPTR*)));
             (*udjsptr)=new UDJSPTR(SHARED_PTR,new JSPTR());
-            (*((*udjsptr)->ptr))=std::move(queue->recv());
+            (*((*udjsptr)->ptr))=queue->recv();
 
               luaL_getmetatable(L, "nljson");
               lua_pushcfunction(L, destroy_nljson_object);