diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-13 16:28:19 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-13 17:56:21 -0700 |
| commit | 4ee9c451fcaec22a4e52ff003e5357907ca485d4 (patch) | |
| tree | c6af59c94d6a85b49c5403e854248645863455d1 /toolsrc | |
| parent | 66ebb6ce2bffa942bda973891cef9e0ae2103ce5 (diff) | |
| download | vcpkg-4ee9c451fcaec22a4e52ff003e5357907ca485d4.tar.gz vcpkg-4ee9c451fcaec22a4e52ff003e5357907ca485d4.zip | |
Rename LINE_INFO to VCPKG_LINE_INFO to avoid conflict with CppUnitTestAssert.h
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/vcpkg_Checks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg_Checks.h index c9293b0bb..7b9f2535f 100644 --- a/toolsrc/include/vcpkg_Checks.h +++ b/toolsrc/include/vcpkg_Checks.h @@ -16,7 +16,7 @@ namespace vcpkg }; } -#define LINE_INFO vcpkg::LineInfo(__LINE__, __FILE__) +#define VCPKG_LINE_INFO vcpkg::LineInfo(__LINE__, __FILE__) namespace vcpkg::Checks { |