diff options
| author | sschirm <[email protected]> | 2017-02-27 16:40:12 +0100 |
|---|---|---|
| committer | sschirm <[email protected]> | 2017-03-01 18:04:26 +0100 |
| commit | 7840347c32755e94a807f978f1cbb558717ac8cf (patch) | |
| tree | 295cd3ca93a45f8fcc43cf3cbf3887c0e0c5526b /APEX_1.4/NvParameterized/src/NvParameterized.cpp | |
| parent | Pre-release comments marking end of beta. (diff) | |
| download | physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.tar.xz physx-3.4-7840347c32755e94a807f978f1cbb558717ac8cf.zip | |
PhysX 3.4, APEX 1.4 final release @21757769v3.4.0-rc-2
Diffstat (limited to 'APEX_1.4/NvParameterized/src/NvParameterized.cpp')
| -rw-r--r-- | APEX_1.4/NvParameterized/src/NvParameterized.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/APEX_1.4/NvParameterized/src/NvParameterized.cpp b/APEX_1.4/NvParameterized/src/NvParameterized.cpp index 0e164abd..7918985d 100644 --- a/APEX_1.4/NvParameterized/src/NvParameterized.cpp +++ b/APEX_1.4/NvParameterized/src/NvParameterized.cpp @@ -56,6 +56,8 @@ namespace NvParameterized char Spog[] = "test"; +#define COND_DUP(str) (mStaticAllocation) ? (char *)(str) : local_strdup(str) + template <typename T> void swap(T& a, T&b) { @@ -64,7 +66,6 @@ void swap(T& a, T&b) a = tmp; } -#define COND_DUP(str) (mStaticAllocation) ? (char *)(str) : local_strdup(str) int32_t local_strcmp(const char* s1, const char* s2) { @@ -5708,7 +5709,7 @@ ErrorType NvParameters::rawSetParamMat34LegacyArray(const Handle &handle, const NV_ERR_CHECK_RETURN(memberHandle.set(offset * 12)); size_t tmp; - void *ptr=NULL; + void *ptr = NULL; this->getVarPtr(memberHandle, ptr, tmp); if(ptr == NULL) { |