[Bf-blender-cvs] [b9c8572] master: Fix wrong assert happening in the CUEW
Sergey Sharybin
noreply at git.blender.org
Tue Aug 5 11:29:10 CEST 2014
Commit: b9c8572d7161633d1cc4528bf1159458e8248bcf
Author: Sergey Sharybin
Date: Tue Aug 5 15:28:32 2014 +0600
Branches: master
https://developer.blender.org/rBb9c8572d7161633d1cc4528bf1159458e8248bcf
Fix wrong assert happening in the CUEW
===================================================================
M extern/cuew/auto/cuew_gen.py
M extern/cuew/src/cuew.c
===================================================================
diff --git a/extern/cuew/auto/cuew_gen.py b/extern/cuew/auto/cuew_gen.py
index 4cdc361..a94525c 100644
--- a/extern/cuew/auto/cuew_gen.py
+++ b/extern/cuew/auto/cuew_gen.py
@@ -416,12 +416,12 @@ typedef void* DynamicLibrary;
def print_dl_helper_macro():
print("""#define %s_LIBRARY_FIND_CHECKED(name) \\
- name = (t##name *)dynamic_library_find(lib, #name);
-
-#define %s_LIBRARY_FIND(name) \\
name = (t##name *)dynamic_library_find(lib, #name); \\
assert(name);
+#define %s_LIBRARY_FIND(name) \\
+ name = (t##name *)dynamic_library_find(lib, #name);
+
static DynamicLibrary lib;""" % (REAL_LIB, REAL_LIB))
print("")
diff --git a/extern/cuew/src/cuew.c b/extern/cuew/src/cuew.c
index 35ffca3..9ba65ac 100644
--- a/extern/cuew/src/cuew.c
+++ b/extern/cuew/src/cuew.c
@@ -50,12 +50,12 @@ typedef void* DynamicLibrary;
#endif
#define CUDA_LIBRARY_FIND_CHECKED(name) \
- name = (t##name *)dynamic_library_find(lib, #name);
-
-#define CUDA_LIBRARY_FIND(name) \
name = (t##name *)dynamic_library_find(lib, #name); \
assert(name);
+#define CUDA_LIBRARY_FIND(name) \
+ name = (t##name *)dynamic_library_find(lib, #name);
+
static DynamicLibrary lib;
/* Function definitions. */
More information about the Bf-blender-cvs
mailing list