Skip to content

Commit 19fbd5e

Browse files
author
Pierre-Luc Gagné
committed
Fix MSVC CI preprocessing and MySQL include
1 parent 49a0fef commit 19fbd5e

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ elseif(MSVC)
4646
/W4 # High warning level
4747
/WX # Warnings as errors
4848
/permissive- # Strict standards conformance
49+
/Zc:preprocessor # Enable standards-conforming preprocessor (__VA_OPT__)
4950
)
5051
endif()
5152

lib/include/ds_mysql/database.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include <mysql/mysql.h>
3+
#include <mysql.h>
44

55
#include <algorithm>
66
#include <cassert>
@@ -12,10 +12,10 @@
1212
#include <string_view>
1313
#include <vector>
1414

15+
#include "ds_mysql/config.hpp"
1516
#include "ds_mysql/credentials.hpp"
1617
#include "ds_mysql/database_name.hpp"
1718
#include "ds_mysql/host_name.hpp"
18-
#include "ds_mysql/config.hpp"
1919
#include "ds_mysql/port_number.hpp"
2020
#include "ds_mysql/sql.hpp"
2121

0 commit comments

Comments
 (0)