Selaa lähdekoodia

illegal token on right-side-of ::Windows

Error without:
```
assimp\material.inl(101,47): message : error recovery skipped: ') ?'
```

Reference : https://stackoverflow.com/questions/2561368/illegal-token-on-right-side-of
RKJ 2 vuotta sitten
vanhempi
commit
6743274b31
1 muutettua tiedostoa jossa 3 lisäystä ja 1 poistoa
  1. 3 1
      include/assimp/material.inl

+ 3 - 1
include/assimp/material.inl

@@ -98,8 +98,10 @@ AI_FORCE_INLINE aiReturn aiMaterial::Get(const char* pKey,unsigned int type,
             return AI_FAILURE;
         }
 
+#undef max
+#undef min
         iNum = static_cast<unsigned int>(std::min(static_cast<size_t>(iNum),prop->mDataLength / sizeof(Type)));
-        ::memcpy(pOut,prop->mData,iNum * sizeof(Type));
+        std::memcpy(pOut,prop->mData,iNum * sizeof(Type));
         if (pMax) {
             *pMax = iNum;
         }