← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/GameLogic/SCA_TimeEventManager.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/GameLogic/SCA_TimeEventManager.cpp
29
29
 *  \ingroup gamelogic
30
30
 */
31
31
 
32
 
 
33
 
#if defined(WIN32) && !defined(FREE_WINDOWS)
34
 
// This warning tells us about truncation of __long__ stl-generated names.
35
 
// It can occasionally cause DevStudio to have internal compiler warnings.
36
 
#pragma warning( disable : 4786 )     
 
32
#ifdef _MSC_VER
 
33
   /* This warning tells us about truncation of __long__ stl-generated names.
 
34
    * It can occasionally cause DevStudio to have internal compiler warnings. */
 
35
#  pragma warning(disable:4786)
37
36
#endif
38
37
 
39
38
#include "SCA_TimeEventManager.h"
54
53
                        !(it == m_timevalues.end()); ++it)
55
54
        {
56
55
                (*it)->Release();
57
 
        }       
 
56
        }
58
57
}
59
58
 
60
59