Changeset 10916 for code/branches/cpp11_v2/src/libraries/util

Timestamp:

Dec 2, 2015, 11:22:03 PM (9 years ago)

Author:

landauf

Message:

use actual types instead of 'auto'. only exception is for complicated template types, e.g. when iterating over a map

Location:

code/branches/cpp11_v2/src/libraries/util

Files:

• DisplayStringConversions.h (modified) (1 diff)
• Serialise.h (modified) (1 diff)
• SignalHandler.cc (modified) (2 diffs)
• SmallObjectAllocator.cc (modified) (1 diff)
• StringUtils.cc (modified) (5 diffs)
• output/BaseWriter.cc (modified) (1 diff)
• output/MemoryWriter.cc (modified) (1 diff)
• output/OutputListener.cc (modified) (3 diffs)
• output/OutputManager.cc (modified) (4 diffs)
• output/SubcontextOutputListener.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/util/DisplayStringConversions.h

@@ -51 +51 @@
             {
                 Ogre::UTFString::code_point cp;
-                for (auto & elem : input)
+                for (const char& character : input)
                 {
-                  cp = elem;
+                  cp = character;
                   cp &= 0xFF;
                   output->append(1, cp);

code/branches/cpp11_v2/src/libraries/util/Serialise.h

@@ -672 +672 @@
     {
         uint32_t tempsize = sizeof(uint32_t); // for the number of entries
-        for(const auto & elem : *((std::set<T>*)(&variable)))
-            tempsize += returnSize( elem );
+        for(const T& element : *((std::set<T>*)(&variable)))
+            tempsize += returnSize( element );
         return tempsize;
     }

code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc

@@ -81 +81 @@
     void SignalHandler::dontCatch()
     {
-      for (auto & elem : sigRecList)
-      {
-        signal( elem.signal, elem.handler );
+      for (const SignalRec& sigRec : sigRecList)
+      {
+        signal( sigRec.signal, sigRec.handler );
       }
 
@@ -133 +133 @@
       }
 
-      for (auto & elem : SignalHandler::getInstance().callbackList)
-      {
-        (*(elem.cb))( elem.someData );
+      for (const SignalCallbackRec& callback : SignalHandler::getInstance().callbackList)
+      {
+        (*(callback.cb))( callback.someData );
       }
 

code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc

@@ -53 +53 @@
     SmallObjectAllocator::~SmallObjectAllocator()
     {
-        for (auto & elem : this->blocks_)
-            delete[] elem;
+        for (char* block : this->blocks_)
+            delete[] block;
     }
 

code/branches/cpp11_v2/src/libraries/util/StringUtils.cc

@@ -262 +262 @@
         std::string output(str.size() * 2, ' ');
         size_t i = 0;
-        for (auto & elem : str)
-        {
-            switch (elem)
+        for (const char& character : str)
+        {
+            switch (character)
             {
             case '\\': output[i] = '\\'; output[i + 1] = '\\'; break;
@@ -276 +276 @@
             case  '"': output[i] = '\\'; output[i + 1] =  '"'; break;
             case '\0': output[i] = '\\'; output[i + 1] =  '0'; break;
-            default  : output[i] = elem; ++i; continue;
+            default  : output[i] = character; ++i; continue;
             }
             i += 2;
@@ -336 +336 @@
     void lowercase(std::string* str)
     {
-        for (auto & elem : *str)
-        {
-            elem = static_cast<char>(tolower(elem));
+        for (char& character : *str)
+        {
+            character = static_cast<char>(tolower(character));
         }
     }
@@ -353 +353 @@
     void uppercase(std::string* str)
     {
-        for (auto & elem : *str)
-        {
-            elem = static_cast<char>(toupper(elem));
+        for (char& character : *str)
+        {
+            character = static_cast<char>(toupper(character));
         }
     }
@@ -460 +460 @@
     {
         size_t j = 0;
-        for (auto & elem : str)
-        {
-            if (elem == target)
+        for (char& character : str)
+        {
+            if (character == target)
             {
-                elem = replacement;
+                character = replacement;
                 ++j;
             }

code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.cc

@@ -116 +116 @@
 
         // iterate over all strings in the config-vector
-        for (auto & full_name : this->configurableAdditionalContexts_)
+        for (const std::string& full_name : this->configurableAdditionalContexts_)
         {
-            
-
             // split the name into main-name and sub-name (if given; otherwise sub-name remains empty). both names are separated by ::
             std::string name = full_name;

code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.cc

@@ -65 +65 @@
     void MemoryWriter::resendOutput(OutputListener* listener) const
     {
-        for (auto & message : this->messages_)
+        for (const Message& message : this->messages_)
         {
-            
             listener->unfilteredOutput(message.level, *message.context, message.lines);
         }

code/branches/cpp11_v2/src/libraries/util/output/OutputListener.cc

@@ -111 +111 @@
         this->levelMask_ = mask;
 
-        for (auto & elem : this->listeners_)
-            elem->updatedLevelMask(this);
+        for (AdditionalContextListener* listener : this->listeners_)
+            listener->updatedLevelMask(this);
     }
 
@@ -142 +142 @@
         this->additionalContextsLevelMask_ = mask;
 
-        for (auto & elem : this->listeners_)
-            elem->updatedAdditionalContextsLevelMask(this);
+        for (AdditionalContextListener* listener : this->listeners_)
+            listener->updatedAdditionalContextsLevelMask(this);
     }
 
@@ -153 +153 @@
         this->additionalContextsMask_ = mask;
 
-        for (auto & elem : this->listeners_)
-            elem->updatedAdditionalContextsMask(this);
+        for (AdditionalContextListener* listener : this->listeners_)
+            listener->updatedAdditionalContextsMask(this);
     }
 

code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc

@@ -131 +131 @@
         vectorize(message, '\n', &lines);
 
-        for (auto & elem : this->listeners_)
-            elem->unfilteredOutput(level, context, lines);
+        for (OutputListener* listener : this->listeners_)
+            listener->unfilteredOutput(level, context, lines);
     }
 
@@ -178 +178 @@
     {
         int mask = 0;
-        for (auto & elem : this->listeners_)
-            mask |= elem->getLevelMask();
+        for (OutputListener* listener : this->listeners_)
+            mask |= listener->getLevelMask();
         this->combinedLevelMask_ = static_cast<OutputLevel>(mask);
     }
@@ -189 +189 @@
     {
         int mask = 0;
-        for (auto & elem : this->listeners_)
-            mask |= elem->getAdditionalContextsLevelMask();
+        for (OutputListener* listener : this->listeners_)
+            mask |= listener->getAdditionalContextsLevelMask();
         this->combinedAdditionalContextsLevelMask_ = static_cast<OutputLevel>(mask);
     }
@@ -200 +200 @@
     {
         this->combinedAdditionalContextsMask_ = 0;
-        for (auto & elem : this->listeners_)
-            this->combinedAdditionalContextsMask_ |= elem->getAdditionalContextsMask();
+        for (OutputListener* listener : this->listeners_)
+            this->combinedAdditionalContextsMask_ |= listener->getAdditionalContextsMask();
     }
 

code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.cc

@@ -79 +79 @@
 
         // compose the mask of subcontexts and build the set of sub-context-IDs
-        for (const auto & subcontext : subcontexts)
+        for (const OutputContextContainer* subcontext : subcontexts)
         {
-            this->subcontextsCheckMask_ |= (subcontext)->mask;
-            this->subcontexts_.insert((subcontext)->sub_id);
+            this->subcontextsCheckMask_ |= subcontext->mask;
+            this->subcontexts_.insert(subcontext->sub_id);
         }