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

« back to all changes in this revision

Viewing changes to extern/bullet2/src/LinearMath/btMinMax.h

  • 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
* 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:
14
14
 
15
15
 
16
16
 
17
 
#ifndef GEN_MINMAX_H
18
 
#define GEN_MINMAX_H
 
17
#ifndef BT_GEN_MINMAX_H
 
18
#define BT_GEN_MINMAX_H
19
19
 
20
 
#include "LinearMath/btScalar.h"
 
20
#include "btScalar.h"
21
21
 
22
22
template <class T>
23
23
SIMD_FORCE_INLINE const T& btMin(const T& a, const T& b) 
68
68
        }
69
69
}
70
70
 
71
 
#endif
 
71
#endif //BT_GEN_MINMAX_H