diff --git a/cygnal/libamf/amf.cpp b/cygnal/libamf/amf.cpp index 8b6aa2f..a49e645 100644 --- a/cygnal/libamf/amf.cpp +++ b/cygnal/libamf/amf.cpp @@ -189,7 +189,7 @@ AMF::encodeObject(const cygnal::Element &data) if (data.propertySize() > 0) { std::vector >::const_iterator ait; std::vector > props = data.getProperties(); - for (ait = props.begin(); ait != props.end(); ait++) { + for (ait = props.begin(); ait != props.end(); ++ait) { boost::shared_ptr el = (*(ait)); boost::shared_ptr item = AMF::encodeElement(el); if (item) { @@ -348,7 +348,7 @@ AMF::encodeTypedObject(const cygnal::Element &data) if (data.propertySize() > 0) { std::vector >::const_iterator ait; std::vector > props = data.getProperties(); - for (ait = props.begin(); ait != props.end(); ait++) { + for (ait = props.begin(); ait != props.end(); ++ait) { boost::shared_ptr el = (*(ait)); boost::shared_ptr item = AMF::encodeElement(el); if (item) { @@ -442,7 +442,7 @@ AMF::encodeECMAArray(const cygnal::Element &data) boost::shared_ptr item; std::vector >::const_iterator ait; std::vector > props = data.getProperties(); - for (ait = props.begin(); ait != props.end(); ait++) { + for (ait = props.begin(); ait != props.end(); ++ait) { boost::shared_ptr el = (*(ait)); if (sparse) { sparse = false; @@ -548,7 +548,7 @@ AMF::encodeStrictArray(const cygnal::Element &data) std::vector > props = data.getProperties(); bool sparse = false; size_t counter = 0; - for (ait = props.begin(); ait != props.end(); ait++) { + for (ait = props.begin(); ait != props.end(); ++ait) { counter++; boost::shared_ptr el = (*(ait)); #if 0 diff --git a/cygnal/libamf/amf_msg.cpp b/cygnal/libamf/amf_msg.cpp index df1b785..f18c4ff 100644 --- a/cygnal/libamf/amf_msg.cpp +++ b/cygnal/libamf/amf_msg.cpp @@ -256,7 +256,7 @@ AMF_msg::encodeAMFPacket() // Now encode all the messages std::vector >::iterator it; - for (it = _messages.begin(); it != _messages.end(); it++) { + for (it = _messages.begin(); it != _messages.end(); ++it) { boost::shared_ptr msg = (*(it)); boost::shared_ptr buf2 = encodeMsgHeader(msg->header.target, @@ -323,7 +323,7 @@ AMF_msg::dump() // GNASH_REPORT_FUNCTION; cout << "AMF Packet has " << _messages.size() << " messages." << endl; std::vector >::iterator it; - for (it = _messages.begin(); it != _messages.end(); it++) { + for (it = _messages.begin(); it != _messages.end(); ++it) { boost::shared_ptr msg = (*(it)); AMF_msg::dump(msg->header); msg->data->dump(); diff --git a/cygnal/libamf/element.cpp b/cygnal/libamf/element.cpp index 81d131d..f87d452 100644 --- a/cygnal/libamf/element.cpp +++ b/cygnal/libamf/element.cpp @@ -968,7 +968,7 @@ Element::makeObject(std::vector > &data) // GNASH_REPORT_FUNCTION; _type = Element::OBJECT_AMF0; std::vector >::const_iterator ait; - for (ait = data.begin(); ait != data.end(); ait++) { + for (ait = data.begin(); ait != data.end(); ++ait) { boost::shared_ptr el = (*(ait)); addProperty(el); // el->dump(os); @@ -1556,7 +1556,7 @@ Element::dump(std::ostream& os) const if (_properties.size() > 0) { std::vector >::const_iterator ait; os << "# of Properties in object: " << _properties.size() << std::endl; - for (ait = _properties.begin(); ait != _properties.end(); ait++) { + for (ait = _properties.begin(); ait != _properties.end(); ++ait) { const boost::shared_ptr el = (*(ait)); el->dump(os); } @@ -1575,7 +1575,7 @@ Element::findProperty(const std::string &name) if (_properties.size() > 0) { std::vector >::iterator ait; // cerr << "# of Properties in object: " << _properties.size() << endl; - for (ait = _properties.begin(); ait != _properties.end(); ait++) { + for (ait = _properties.begin(); ait != _properties.end(); ++ait) { boost::shared_ptr el = (*(ait)); if (el->getName() == name) { return el; diff --git a/cygnal/libamf/flv.cpp b/cygnal/libamf/flv.cpp index 1e8024e..0f8a206 100644 --- a/cygnal/libamf/flv.cpp +++ b/cygnal/libamf/flv.cpp @@ -312,7 +312,7 @@ Flv::findProperty(const std::string &name) if (_properties.size() > 0) { std::vector >::iterator ait; // cerr << "# of Properties in object: " << _properties.size() << endl; - for (ait = _properties.begin(); ait != _properties.end(); ait++) { + for (ait = _properties.begin(); ait != _properties.end(); ++ait) { boost::shared_ptr el = (*(ait)); if (el->getName() == name) { return el; @@ -332,7 +332,7 @@ Flv::dump() std::vector >::iterator ait; std::cerr << "# of Properties in object: " << _properties.size() << std::endl; - for (ait = _properties.begin(); ait != _properties.end(); ait++) { + for (ait = _properties.begin(); ait != _properties.end(); ++ait) { boost::shared_ptr el = (*(ait)); // an onMetaData packet of an FLV stream only contains number or // boolean bydefault diff --git a/cygnal/libamf/lcshm.cpp b/cygnal/libamf/lcshm.cpp index 70558d6..0a5d6f8 100644 --- a/cygnal/libamf/lcshm.cpp +++ b/cygnal/libamf/lcshm.cpp @@ -615,7 +615,7 @@ LcShm::send(const string& name , const string& domainname , // Put this value into the header if necessary. int message_size=0; if (data.size()!=0){ - for(iter = data.begin(); iter != data.end(); iter++){ + for(iter = data.begin(); iter != data.end(); ++iter){ boost::shared_ptr buf = AMF::encodeElement(*iter); message_size+=buf->size(); } @@ -659,7 +659,7 @@ LcShm::send(const string& name , const string& domainname , log_debug(_(" ***** The size of the data is %s *****"),data.size() ); if (data.size()==0){ - for(iter = data.begin(); iter != data.end(); iter++){ + for(iter = data.begin(); iter != data.end(); ++iter){ // temporary buf for element boost::shared_ptr buf = AMF::encodeElement(*iter); memcpy(ptr, buf->begin(), buf->size() ); @@ -789,7 +789,7 @@ LcShm::dump() cerr << "Domain Allowed:\t\t" << ((_object.domain) ? "true" : "false") << endl; vector >::iterator ait; cerr << "# of Elements in file: " << _amfobjs.size() << endl; - for (ait = _amfobjs.begin(); ait != _amfobjs.end(); ait++) { + for (ait = _amfobjs.begin(); ait != _amfobjs.end(); ++ait) { boost::shared_ptr el = (*(ait)); el->dump(); } @@ -797,7 +797,7 @@ LcShm::dump() vector::const_iterator lit; auto_ptr< vector > listeners ( listListeners() ); cerr << "# of Listeners in file: " << listeners->size() << endl; - for (lit=listeners->begin(); lit!=listeners->end(); lit++) { + for (lit=listeners->begin(); lit!=listeners->end(); ++lit) { string str = *lit; if (str[0] != ':') { cerr << "Listeners:\t" << str << endl; diff --git a/cygnal/libamf/sol.cpp b/cygnal/libamf/sol.cpp index 0963dcd..e591de8 100644 --- a/cygnal/libamf/sol.cpp +++ b/cygnal/libamf/sol.cpp @@ -243,7 +243,7 @@ SOL::writeFile(const std::string &filespec, const std::string &name) return false; } - for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ita++) { + for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ++ita) { boost::shared_ptr el = (*(ita)); size += el->getNameSize() + el->getDataSize() + 7; } @@ -254,7 +254,7 @@ SOL::writeFile(const std::string &filespec, const std::string &name) ptr = body.get(); char* endPtr = ptr+size+20; // that's the amount we allocated.. - for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ita++) { + for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ++ita) { boost::shared_ptr el = (*(ita)); boost::shared_ptr var = amf_obj.encodeProperty(el); // boost::uint8_t *var = amf_obj.encodeProperty(el, outsize); @@ -310,7 +310,7 @@ SOL::writeFile(const std::string &filespec, const std::string &name) memset(head.get(), 0, len); ptr = head.get(); formatHeader(name); - for (it = _header.begin(); it != _header.end(); it++) { + for (it = _header.begin(); it != _header.end(); ++it) { *ptr++ = (*(it)); } @@ -445,7 +445,7 @@ SOL::updateSO(boost::shared_ptr &newel) { // GNASH_REPORT_FUNCTION; vector >::iterator ita; - for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ita++) { + for (ita = _amfobjs.begin(); ita != _amfobjs.end(); ++ita) { boost::shared_ptr oldel = (*(ita)); if (oldel == newel) { oldel = newel; @@ -475,7 +475,7 @@ SOL::dump() cerr << "The file name is: " << _filespec << endl; cerr << "The size of the file is: " << _filesize << endl; cerr << "The name of the object is: " << _objname << endl; - for (it = _amfobjs.begin(); it != _amfobjs.end(); it++) { + for (it = _amfobjs.begin(); it != _amfobjs.end(); ++it) { boost::shared_ptr el = (*(it)); cerr << el->getName() << ": "; if (el->getType() == Element::STRING_AMF0) { diff --git a/cygnal/libnet/cache.cpp b/cygnal/libnet/cache.cpp index ffc9755..2a273ab 100644 --- a/cygnal/libnet/cache.cpp +++ b/cygnal/libnet/cache.cpp @@ -227,7 +227,7 @@ Cache::stats(bool xml) const } map >::const_iterator data; - for (data = _files.begin(); data != _files.end(); data++) { + for (data = _files.begin(); data != _files.end(); ++data) { const struct timespec *last = data->second->getLastAccessTime(); time = ((now.tv_sec - last->tv_sec) + ((now.tv_nsec - last->tv_nsec)/1e9)); if (xml) { @@ -261,20 +261,20 @@ Cache::dump(std::ostream& os) const // Dump all the pathnames os << "Pathname cache has " << _pathnames.size() << " files." << endl; map::const_iterator name; - for (name = _pathnames.begin(); name != _pathnames.end(); name++) { + for (name = _pathnames.begin(); name != _pathnames.end(); ++name) { os << "Full path for \"" << name->first << "\" is: " << name->second << endl; } // Dump the responses os << "Responses cache has " << _responses.size() << " files." << endl; - for (name = _responses.begin(); name != _responses.end(); name++) { + for (name = _responses.begin(); name != _responses.end(); ++name) { os << "Response for \"" << name->first << "\" is: " << name->second << endl; } os << "DiskStream cache has " << _files.size() << " files." << endl; map >::const_iterator data; - for (data = _files.begin(); data != _files.end(); data++) { + for (data = _files.begin(); data != _files.end(); ++data) { boost::shared_ptr filedata = data->second; os << "file info for \"" << data->first << "\" is: " << endl; filedata->dump(); diff --git a/cygnal/libnet/cque.cpp b/cygnal/libnet/cque.cpp index 26b1750..baba956 100644 --- a/cygnal/libnet/cque.cpp +++ b/cygnal/libnet/cque.cpp @@ -165,7 +165,7 @@ CQue::remove(boost::shared_ptr begin, boost::shared_ptr >::iterator stop; boost::mutex::scoped_lock lock(_mutex); boost::shared_ptr ptr; - for (it = _que.begin(); it != _que.end(); it++) { + for (it = _que.begin(); it != _que.end(); ++it) { ptr = *(it); if (ptr->reference() == begin->reference()) { start = it; @@ -190,7 +190,7 @@ CQue::remove(boost::shared_ptr element) if (ptr->reference() == element->reference()) { it = _que.erase(it); } else { - it++; + ++it; } } } @@ -265,7 +265,7 @@ CQue::dump() boost::mutex::scoped_lock lock(_mutex); std::cerr << std::endl << "CQue \"" << _name << "\" has "<< _que.size() << " buffers." << std::endl; - for (it = _que.begin(); it != _que.end(); it++) { + for (it = _que.begin(); it != _que.end(); ++it) { boost::shared_ptr ptr = *(it); ptr->dump(); } diff --git a/cygnal/libnet/network.cpp b/cygnal/libnet/network.cpp index 0c1fc49..e6cb1d9 100644 --- a/cygnal/libnet/network.cpp +++ b/cygnal/libnet/network.cpp @@ -1282,7 +1282,7 @@ Network::erasePollFD(int fd) boost::mutex::scoped_lock lock(_poll_mutex); if (_pollfds.size() > 0) { vector::iterator it; - for (it=_pollfds.begin(); it<_pollfds.end(); it++) { + for (it=_pollfds.begin(); it<_pollfds.end(); ++it) { if ((*it).fd == fd) { _pollfds.erase(it); break; diff --git a/cygnal/libnet/rtmp.cpp b/cygnal/libnet/rtmp.cpp index 11db3f3..aa29b1d 100644 --- a/cygnal/libnet/rtmp.cpp +++ b/cygnal/libnet/rtmp.cpp @@ -555,7 +555,7 @@ RTMP::dump() cerr << "RTMP packet contains " << _properties.size() << " variables." << std::endl; AMFProperties::iterator it; - for (it = _properties.begin(); it != _properties.end(); it++) { + for (it = _properties.begin(); it != _properties.end(); ++it) { // const char *name = it->first; cygnal::Element el = it->second; el.dump(); diff --git a/cygnal/libnet/rtmp_msg.cpp b/cygnal/libnet/rtmp_msg.cpp index a606137..5ed624c 100644 --- a/cygnal/libnet/rtmp_msg.cpp +++ b/cygnal/libnet/rtmp_msg.cpp @@ -129,13 +129,13 @@ RTMPMsg::checkStatus(boost::shared_ptr /* el */) vector >::iterator pit; vector >::iterator cit; // cerr << "# of Properties in object" << _amfobjs.size() << endl; - for (pit = _amfobjs.begin(); pit != _amfobjs.end(); pit++) { + for (pit = _amfobjs.begin(); pit != _amfobjs.end(); ++pit) { boost::shared_ptr el = (*(pit)); std::vector > props = el->getProperties(); // printf("FIXME2: %d, %s:%s\n", props.size(), // props[2]->getName(), props[2]->to_string()); if (el->getType() == Element::OBJECT_AMF0) { - for (cit = props.begin(); cit != props.end(); cit++) { + for (cit = props.begin(); cit != props.end(); ++cit) { boost::shared_ptr child = (*(cit)); // child->dump(); std::string name = child->getName(); @@ -189,7 +189,7 @@ RTMPMsg::findProperty(const std::string &name) if (_amfobjs.size() > 0) { vector >::iterator ait; // cerr << "# of Properties in object: " << _properties.size() << endl; - for (ait = _amfobjs.begin(); ait != _amfobjs.end(); ait++) { + for (ait = _amfobjs.begin(); ait != _amfobjs.end(); ++ait) { boost::shared_ptr el = (*(ait)); boost::shared_ptr prop = el->findProperty(name); if (prop) { @@ -217,7 +217,7 @@ RTMPMsg::dump() vector >::iterator ait; cerr << "# of Elements in file: " << _amfobjs.size() << endl; - for (ait = _amfobjs.begin(); ait != _amfobjs.end(); ait++) { + for (ait = _amfobjs.begin(); ait != _amfobjs.end(); ++ait) { boost::shared_ptr el = (*(ait)); el->dump(); } diff --git a/cygnal/libnet/statistics.cpp b/cygnal/libnet/statistics.cpp index 2101f73..58b6a94 100644 --- a/cygnal/libnet/statistics.cpp +++ b/cygnal/libnet/statistics.cpp @@ -107,7 +107,7 @@ Statistics::dump() { boost::mutex::scoped_lock lock(io_mutex); std::list::iterator it; - for (it = _netstats.begin(); it != _netstats.end(); it++) { + for (it = _netstats.begin(); it != _netstats.end(); ++it) { NetStats *stats = (*it); if (stats->getFileType() <= VIDEO) { log_debug (_("Stream type is: %s"), filetype_names[stats->getFileType()]); diff --git a/cygnal/rtmp_server.cpp b/cygnal/rtmp_server.cpp index 88d742d..497ecd6 100644 --- a/cygnal/rtmp_server.cpp +++ b/cygnal/rtmp_server.cpp @@ -1334,7 +1334,7 @@ RTMPServer::sendToClient(std::vector &fds, boost::uint8_t *data, size_t ret = 0; std::vector::iterator it; - for (it=fds.begin(); it< fds.end(); it++) { + for (it=fds.begin(); it< fds.end(); ++it) { ret = writeNet(data, size); } diff --git a/cygnal/testsuite/libamf.all/test_lc.cpp b/cygnal/testsuite/libamf.all/test_lc.cpp index 52b72f0..8079bc9 100644 --- a/cygnal/testsuite/libamf.all/test_lc.cpp +++ b/cygnal/testsuite/libamf.all/test_lc.cpp @@ -191,7 +191,7 @@ test_listen() if (listeners->size() == 0) { cout << "Nobody is listening" << endl; } else { - for (it=listeners->begin(); it!=listeners->end(); it++) { + for (it=listeners->begin(); it!=listeners->end(); ++it) { string str = *it; if ((str[0] != ':') || (dbglogfile.getVerbosity() > 0)) { cout << " Listeners: " << str << endl; @@ -333,7 +333,7 @@ test_read() if (listeners->size() == 0) { cout << "Nobody is listening" << endl; } else { - for (it=listeners->begin(); it!=listeners->end(); it++) { + for (it=listeners->begin(); it!=listeners->end(); ++it) { string str = *it; if ((str[0] != ':') || (dbglogfile.getVerbosity() > 0)) { cout << " Listeners: " << str << endl; @@ -355,7 +355,7 @@ test_read() if (listeners->empty()) { cout << "Nobody is listening" << endl; } else { - for (it=listeners->begin(); it!=listeners->end(); it++) { + for (it=listeners->begin(); it!=listeners->end(); ++it) { string str = *it; if ((str[0] != ':') || (dbglogfile.getVerbosity() > 0)) { cout << " Listeners: " << str << endl; diff --git a/extensions/gtk2/gtkext.cpp b/extensions/gtk2/gtkext.cpp index c77a2e3..9e251b5 100644 --- a/extensions/gtk2/gtkext.cpp +++ b/extensions/gtk2/gtkext.cpp @@ -67,7 +67,7 @@ void dump_callbacks(map &calls) // GNASH_REPORT_FUNCTION; map::const_iterator it; dbglogfile << "# of callbacks is: " << calls.size() << endl; - for (it=calls.begin(); it != calls.end(); it++) { + for (it=calls.begin(); it != calls.end(); ++it) { string name = (*it).first; as_value as = (*it).second; dbglogfile << "Event \"" << name.c_str() << "\" has AS function" << as.to_string() << endl; diff --git a/librender/opengl/Renderer_ogl.cpp b/librender/opengl/Renderer_ogl.cpp index 1d4102e..652ee6e 100644 --- a/librender/opengl/Renderer_ogl.cpp +++ b/librender/opengl/Renderer_ogl.cpp @@ -804,7 +804,7 @@ public: // Look for a texture with the same dimensions and type std::list< boost::shared_ptr >::iterator it; - for (it = _cached_textures.begin(); it != _cached_textures.end(); it++) { + for (it = _cached_textures.begin(); it != _cached_textures.end(); ++it) { if ((*it)->width() == frame->width() && (*it)->height() == frame->height() && (*it)->internal_format() == frameFormat.internal_format() && diff --git a/plugin/aos4/plugin.cpp b/plugin/aos4/plugin.cpp index 67a1069..4ee69f2 100644 --- a/plugin/aos4/plugin.cpp +++ b/plugin/aos4/plugin.cpp @@ -433,7 +433,7 @@ nsPluginInstance::threadMain(void) VariableMap vars; gnash::URL::parse_querystring(url.querystring(), vars); - for (VariableMap::iterator i = vars.begin(), ie = vars.end(); i != ie; i++) { + for (VariableMap::iterator i = vars.begin(), ie = vars.end(); i != ie; ++i) { _flashVars[i->first] = i->second; } diff --git a/plugin/win32/plugin.cpp b/plugin/win32/plugin.cpp index 82ec505..771d6e7 100644 --- a/plugin/win32/plugin.cpp +++ b/plugin/win32/plugin.cpp @@ -431,7 +431,7 @@ nsPluginInstance::threadMain(void) VariableMap vars; gnash::URL::parse_querystring(url.querystring(), vars); - for (VariableMap::iterator i = vars.begin(), ie = vars.end(); i != ie; i++) { + for (VariableMap::iterator i = vars.begin(), ie = vars.end(); i != ie; ++i) { _flashVars[i->first] = i->second; }