Compile fixes 👾

ryjen · Jul 8, 2019 · 03566dd · 03566dd
1 parent 928ce95
commit 03566dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/mysql/binding.cpp b/src/mysql/binding.cpp
@@ -41,7 +41,7 @@ namespace coda
                         return;
                     }
                     value->buffer_type = field->type;
-                    value->is_null = (field->flags & NOT_NULL_FLAG) ? 0 : c_alloc<my_bool>();
+                    value->is_null = (field->flags & NOT_NULL_FLAG) ? 0 : c_alloc<bool>();
                     value->is_unsigned = field->flags & UNSIGNED_FLAG;
                     value->error = 0;
                     value->length = 0;
@@ -113,13 +113,13 @@ namespace coda
                     }
 
                     if (other->is_null) {
-                        value->is_null = c_alloc<my_bool>();
-                        memmove(value->is_null, other->is_null, sizeof(my_bool));
+                        value->is_null = c_alloc<bool>();
+                        memmove(value->is_null, other->is_null, sizeof(bool));
                     }
 
                     if (other->error) {
-                        value->error = c_alloc<my_bool>();
-                        memmove(value->error, other->error, sizeof(my_bool));
+                        value->error = c_alloc<bool>();
+                        memmove(value->error, other->error, sizeof(bool));
                     }
 
                     value->buffer_type = other->buffer_type;

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -87,6 +87,8 @@ add_executable (${MYSQL_TEST_PROJECT_NAME}
 
 target_link_libraries (${MYSQL_TEST_PROJECT_NAME} ${MYSQL_PROJECT_NAME} ${UTIL_TEST_PROJECT_NAME} ${COMMON_TEST_PROJECT_NAME})
 
+target_link_directories (${MYSQL_TEST_PROJECT_NAME} PUBLIC ${MYSQL_LIB_DIR})
+
 target_include_directories(${MYSQL_TEST_PROJECT_NAME} SYSTEM PUBLIC ${MYSQL_INCLUDE_DIR} SYSTEM PUBLIC ${BANDIT_DIR} INTERFACE ${PROJECT_SOURCE_DIR}/src)
 
 endif()