Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 1, 2008, 9:29:23 PM (17 years ago)
Author:
landauf
Message:

(1) removed ExportClass and ExportAbstractClass macros
(2) removed _UtilExport from templates

reto, i hope (2) removed some of your compiler errors and orxonox works still on your system with (1)

Location:
code/branches/core/src/util
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core/src/util/Convert.h

    r827 r845  
    4141// DEFAULT CLASS
    4242template <typename FromType, typename ToType>
    43 class _UtilExport Converter
     43class Converter
    4444{
    4545  public:
    … …  
    5252// PARTIAL SPECIALIZATION TO CONVERT TO STRINGS
    5353template<typename FromType>
    54 class _UtilExport Converter<FromType, std::string>
     54class Converter<FromType, std::string>
    5555{
    5656  public:
    … …  
    7070// PARTIAL SPECIALIZATION TO CONVERT FROM STRING
    7171template<typename ToType>
    72 class _UtilExport Converter<std::string, ToType>
     72class Converter<std::string, ToType>
    7373{
    7474  public:
    … …  
    8585// FUNCTION SO WE DO NOT HAVE TO TELL THE COMPILER ABOUT THE TYPE
    8686template<typename FromType, typename ToType>
    87 static _UtilExport bool ConvertValue(ToType* output, const FromType& input)
     87static bool ConvertValue(ToType* output, const FromType& input)
    8888{
    8989  Converter<FromType, ToType> converter;
    … …  
    9393// THE SAME, BUT WITH DEFAULT VALUE
    9494template<typename FromType, typename ToType>
    95 static _UtilExport bool ConvertValue(ToType* output, const FromType& input, const ToType& fallback)
     95static bool ConvertValue(ToType* output, const FromType& input, const ToType& fallback)
    9696{
    9797  Converter<FromType, ToType> converter;
    … …  
    108108// Vector2 to std::string
    109109template <>
    110 class _UtilExport Converter<orxonox::Vector2, std::string>
     110class Converter<orxonox::Vector2, std::string>
    111111{
    112112  public:
    … …  
    126126// Vector3 to std::string
    127127template <>
    128 class _UtilExport Converter<orxonox::Vector3, std::string>
     128class Converter<orxonox::Vector3, std::string>
    129129{
    130130  public:
    … …  
    144144// Vector4 to std::string
    145145template <>
    146 class _UtilExport Converter<orxonox::Vector4, std::string>
     146class Converter<orxonox::Vector4, std::string>
    147147{
    148148  public:
    … …  
    162162// Quaternion to std::string
    163163template <>
    164 class _UtilExport Converter<orxonox::Quaternion, std::string>
     164class Converter<orxonox::Quaternion, std::string>
    165165{
    166166  public:
    … …  
    180180// ColourValue to std::string
    181181template <>
    182 class _UtilExport Converter<orxonox::ColourValue, std::string>
     182class Converter<orxonox::ColourValue, std::string>
    183183{
    184184  public:

  • code/branches/core/src/util/Math.h

    r792 r845  
    5959
    6060template <typename T>
    61 inline _UtilExport T sgn(T x)
     61inline T sgn(T x)
    6262{
    6363    return (x >= 0) ? 1 : -1;
    … …  
    6565
    6666template <typename T>
    67 inline _UtilExport T min(T a, T b)
     67inline T min(T a, T b)
    6868{
    6969    return (a <= b) ? a : b;
    … …  
    7171
    7272template <typename T>
    73 inline _UtilExport T max(T a, T b)
     73inline T max(T a, T b)
    7474{
    7575    return (a >= b) ? a : b;
    … …  
    7777
    7878template <typename T>
    79 inline _UtilExport T clamp(T x, T min, T max)
     79inline T clamp(T x, T min, T max)
    8080{
    8181    if (x < min)
    … …  
    8989
    9090template <typename T>
    91 inline _UtilExport T square(T x)
     91inline T square(T x)
    9292{
    9393    return x*x;
    … …  
    9595
    9696template <typename T>
    97 inline _UtilExport T cube(T x)
     97inline T cube(T x)
    9898{
    9999    return x*x*x;
    … …  
    101101
    102102template <typename T>
    103 inline _UtilExport int floor(T x)
     103inline int floor(T x)
    104104{
    105105    return (int)(x);
    … …  
    107107
    108108template <typename T>
    109 inline _UtilExport int ceil(T x)
     109inline int ceil(T x)
    110110{
    111111    int temp = floor(x);
    … …  
    114114
    115115template <typename T>
    116 inline _UtilExport int round(T x)
     116inline int round(T x)
    117117{
    118118    return (int)(x + 0.5);
    … …  
    120120
    121121template <typename T>
    122 _UtilExport T interpolate(float time, const T& start, const T& end)
     122T interpolate(float time, const T& start, const T& end)
    123123{
    124124    return time * (end - start) + start;
    … …  
    126126
    127127template <typename T>
    128 _UtilExport T interpolateSmooth(float time, const T& start, const T& end)
     128T interpolateSmooth(float time, const T& start, const T& end)
    129129{
    130130    return (-2 * (end - start) * cube(time)) + (3 * (end - start) * square(time)) + start;

  • code/branches/core/src/util/String2Number.h

    r792 r845  
    2424
    2525template <class T>
    26 class _UtilExport String2Number
     26class String2Number
    2727{
    2828  private:
Note: See TracChangeset for help on using the changeset viewer.