Suppressed a couple implicit type conversion warnings and updated

solution to only build minimal set of projects for -Con variations.
This commit is contained in:
casey langen 2020-02-14 14:57:14 -08:00
parent db315da44c
commit 255383af10
7 changed files with 8 additions and 64 deletions

View File

@ -96,9 +96,7 @@ Global
{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Win|Win64.ActiveCfg = Release|x64
{C7102EB1-7311-4B36-A7FF-89DD7F077FF9}.Release-Win|Win64.Build.0 = Release|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -106,9 +104,7 @@ Global
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win64.ActiveCfg = Debug|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Debug-Win|Win64.Build.0 = Debug|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win32.Build.0 = Release-Con|Win32
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Con|Win64.Build.0 = Release-Con|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{54764854-5A73-4329-9BAD-9AF22C72D9E2}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -164,9 +160,7 @@ Global
{B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Win|Win64.ActiveCfg = Release|x64
{B2165720-B4B2-4F4B-9634-8C390C3CB4DB}.Release-Win|Win64.Build.0 = Release|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -174,9 +168,7 @@ Global
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win64.ActiveCfg = Debug|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Debug-Win|Win64.Build.0 = Debug|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win32.Build.0 = Release-Con|Win32
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Con|Win64.Build.0 = Release-Con|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -184,9 +176,7 @@ Global
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win64.ActiveCfg = Release|x64
{7CD00EC4-D090-48BE-9388-FA4857AC332C}.Release-Win|Win64.Build.0 = Release|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -194,9 +184,7 @@ Global
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win64.ActiveCfg = Debug|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Debug-Win|Win64.Build.0 = Debug|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win32.Build.0 = Release-Con|Win32
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Con|Win64.Build.0 = Release-Con|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -204,9 +192,7 @@ Global
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win64.ActiveCfg = Release|x64
{4F10C17A-8AF7-4FAC-A4E2-087AE6E8F9D8}.Release-Win|Win64.Build.0 = Release|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -214,9 +200,7 @@ Global
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win64.ActiveCfg = Debug|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Debug-Win|Win64.Build.0 = Debug|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win32.Build.0 = Release-Con|Win32
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Con|Win64.Build.0 = Release-Con|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -224,9 +208,7 @@ Global
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win64.ActiveCfg = Release|x64
{3E30064E-B9C4-4690-8AC2-2C694176A319}.Release-Win|Win64.Build.0 = Release|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -234,9 +216,7 @@ Global
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win64.ActiveCfg = Debug|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Debug-Win|Win64.Build.0 = Debug|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win32.Build.0 = Release-Con|Win32
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Con|Win64.Build.0 = Release-Con|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -244,9 +224,7 @@ Global
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win64.ActiveCfg = Release|x64
{68AA481E-3CCE-440F-8CCE-69F1B371C89D}.Release-Win|Win64.Build.0 = Release|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -254,9 +232,7 @@ Global
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win64.ActiveCfg = Debug|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Debug-Win|Win64.Build.0 = Debug|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win32.Build.0 = Release-Con|Win32
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Con|Win64.Build.0 = Release-Con|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -264,9 +240,7 @@ Global
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win64.ActiveCfg = Release|x64
{EBD2E652-AA1B-4B8B-8D03-CCECB9BF3304}.Release-Win|Win64.Build.0 = Release|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -274,9 +248,7 @@ Global
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win64.ActiveCfg = Debug|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Debug-Win|Win64.Build.0 = Debug|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win32.Build.0 = Release-Con|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Con|Win64.Build.0 = Release-Con|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -284,9 +256,7 @@ Global
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win64.ActiveCfg = Release|x64
{51C18730-DC48-411A-829D-F2B3B7AC4C97}.Release-Win|Win64.Build.0 = Release|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -294,9 +264,7 @@ Global
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win64.ActiveCfg = Debug|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Debug-Win|Win64.Build.0 = Debug|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win32.Build.0 = Release-Con|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Con|Win64.Build.0 = Release-Con|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -304,9 +272,7 @@ Global
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win64.ActiveCfg = Release|x64
{BA3902E0-8915-4E59-AD3B-F9960507F234}.Release-Win|Win64.Build.0 = Release|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -314,9 +280,7 @@ Global
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win64.ActiveCfg = Debug|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Debug-Win|Win64.Build.0 = Debug|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win32.Build.0 = Release-Con|Win32
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Con|Win64.Build.0 = Release-Con|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -324,9 +288,7 @@ Global
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win64.ActiveCfg = Release|x64
{43A78C57-C9A3-4852-B0BE-05335C5C077D}.Release-Win|Win64.Build.0 = Release|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -334,9 +296,7 @@ Global
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win64.ActiveCfg = Debug|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Debug-Win|Win64.Build.0 = Debug|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win32.Build.0 = Release-Con|Win32
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Con|Win64.Build.0 = Release-Con|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -344,9 +304,7 @@ Global
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win64.ActiveCfg = Release|x64
{FA74D37C-8184-4596-BFE9-766C159045E1}.Release-Win|Win64.Build.0 = Release|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -354,9 +312,7 @@ Global
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win64.ActiveCfg = Debug|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Debug-Win|Win64.Build.0 = Debug|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win32.Build.0 = Release-Con|Win32
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Con|Win64.Build.0 = Release-Con|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -364,9 +320,7 @@ Global
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win64.ActiveCfg = Release|x64
{8AD92D25-0921-44AB-BBEF-5244F5CFC6DA}.Release-Win|Win64.Build.0 = Release|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -374,9 +328,7 @@ Global
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win64.ActiveCfg = Debug|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Debug-Win|Win64.Build.0 = Debug|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win32.Build.0 = Release-Con|Win32
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Con|Win64.Build.0 = Release-Con|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -384,9 +336,7 @@ Global
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win64.ActiveCfg = Release|x64
{F1C18D01-9173-41C6-8C73-DC501582F227}.Release-Win|Win64.Build.0 = Release|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -394,9 +344,7 @@ Global
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win64.ActiveCfg = Debug|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Debug-Win|Win64.Build.0 = Debug|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win32.Build.0 = Release-Con|Win32
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Con|Win64.Build.0 = Release-Con|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win32.ActiveCfg = Release|Win32
@ -404,9 +352,7 @@ Global
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win64.ActiveCfg = Release|x64
{ED0F666A-C9E4-4B6C-AF89-BAFBB47C3730}.Release-Win|Win64.Build.0 = Release|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win32.ActiveCfg = Debug-Con|Win32
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win32.Build.0 = Debug-Con|Win32
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win64.ActiveCfg = Debug-Con|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Con|Win64.Build.0 = Debug-Con|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-DLL|Win32.ActiveCfg = Debug-DLL|Win32
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-DLL|Win64.ActiveCfg = Debug-DLL|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win32.ActiveCfg = Debug|Win32
@ -414,9 +360,7 @@ Global
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win64.ActiveCfg = Debug|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Debug-Win|Win64.Build.0 = Debug|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win32.ActiveCfg = Release-Con|Win32
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win32.Build.0 = Release-Con|Win32
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win64.ActiveCfg = Release-Con|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Con|Win64.Build.0 = Release-Con|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-DLL|Win32.ActiveCfg = Release-DLL|Win32
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-DLL|Win64.ActiveCfg = Release-DLL|x64
{89FD1021-21B5-44EB-BDBE-70381ADE8522}.Release-Win|Win32.ActiveCfg = Release|Win32

View File

@ -420,7 +420,7 @@ void Indexer::ReadMetadataFromFile(
#endif
}
inline void Indexer::IncrementTracksScanned(size_t delta) {
inline void Indexer::IncrementTracksScanned(int delta) {
std::unique_lock<std::mutex> lock(IndexerTrack::sharedWriteMutex);
this->incrementalUrisScanned.fetch_add(delta);
@ -518,7 +518,7 @@ ScanResult Indexer::SyncSource(
/* now tell it to do a wide-open scan. it can use this opportunity to
remove old tracks, or add new ones. */
try {
result = source->Scan(this, pathsList, paths.size());
result = source->Scan(this, pathsList, (unsigned int) paths.size());
}
catch (...) {
debug::error("Indexer", "failed to index " + std::to_string(source->SourceId()));

View File

@ -138,7 +138,7 @@ namespace musik { namespace core {
int RemoveAllForSourceId(int sourceId);
void Schedule(SyncType type, musik::core::sdk::IIndexerSource *source);
void IncrementTracksScanned(size_t delta = 1);
void IncrementTracksScanned(int delta = 1);
void SyncDirectory(
boost::asio::io_service* io,
@ -159,7 +159,7 @@ namespace musik { namespace core {
boost::mutex stateMutex;
boost::condition waitCondition;
boost::thread *thread;
std::atomic<size_t> incrementalUrisScanned, totalUrisScanned;
std::atomic<int> incrementalUrisScanned, totalUrisScanned;
std::deque<AddRemoveContext> addRemoveQueue;
std::deque<SyncContext> syncQueue;
TagReaderList tagReaders;

View File

@ -134,7 +134,7 @@ class ExternalIdListToTrackListQuery : public TrackListQueryBase {
Statement query(sql.c_str(), db);
for (size_t i = 0; i < externalIdCount; i++) {
query.BindText(i, externalIds[i]);
query.BindText((int) i, externalIds[i]);
}
/* gotta eat up some memory to preserve the input order. map the

View File

@ -96,7 +96,7 @@ musik::core::sdk::IResource::Class MetadataMap::GetClass() {
int MetadataMap::GetString(const char* key, char* dst, int size) {
auto it = metadata.find(key);
if (it != metadata.end()) {
return CopyString(it->second, dst, size);
return (int) CopyString(it->second, dst, (size_t) size);
}
if (dst && size > 0) {

View File

@ -114,7 +114,7 @@ int CategoryListQuery::GetIndexOf(int64_t id) {
auto result = this->GetResult();
for (size_t i = 0; i < result->Count(); i++) {
if (id == result->GetAt(i)->GetId()) {
return i;
return (int) i;
}
}
return -1;

View File

@ -298,7 +298,7 @@ double Preferences::GetDouble(const char* key, double defaultValue) {
int Preferences::GetString(const char* key, char* dst, size_t size, const char* defaultValue) {
std::string value = this->GetString(std::string(key), defaultValue);
return CopyString(value, dst, size);
return (int) CopyString(value, dst, size);
}
void Preferences::SetBool(const char* key, bool value) {