From 1b94904be0eebfb73d470d3925d76e7ad1ae408e Mon Sep 17 00:00:00 2001 From: namodaj Date: Thu, 28 Mar 2024 11:24:14 -0700 Subject: [PATCH 01/61] upgrade to VS 2022, solution filter added for Storage Device development --- DeviceAdapters/89NorthLDI/89North_LDI.vcxproj | 4 +- DeviceAdapters/AAAOTF/AAAOTF.vcxproj | 4 +- DeviceAdapters/ABS/ABSCamera.vcxproj | 4 +- DeviceAdapters/AOTF/AOTF.vcxproj | 4 +- DeviceAdapters/ASIFW1000/ASIFW1000.vcxproj | 4 +- DeviceAdapters/ASIStage/ASIStage.vcxproj | 6 +-- DeviceAdapters/ASITiger/ASITiger.vcxproj | 6 +-- DeviceAdapters/ASIWPTR/ASIwptr.vcxproj | 4 +- .../AgilentLaserCombiner.vcxproj | 4 +- DeviceAdapters/Aladdin/Aladdin.vcxproj | 4 +- .../AlliedVisionCamera.vcxproj | 4 +- DeviceAdapters/AmScope/AmScope.vcxproj | 4 +- DeviceAdapters/Andor/Andor.vcxproj | 4 +- .../AndorLaserCombiner.vcxproj | 4 +- DeviceAdapters/AndorSDK3/AndorSDK3.vcxproj | 4 +- .../AndorShamrock/AndorShamrock.vcxproj | 4 +- DeviceAdapters/Aquinas/Aquinas.vcxproj | 4 +- DeviceAdapters/Arduino/Arduino.vcxproj | 4 +- .../Arduino32bitBoards.vcxproj | 4 +- .../ArduinoCounter/ArduinoCounter.vcxproj | 6 +-- DeviceAdapters/Atik/AtikCamera.vcxproj | 4 +- DeviceAdapters/BDPathway/BDPathway.vcxproj | 4 +- DeviceAdapters/BH_DCC_DCU/BH_DCC_DCU.vcxproj | 4 +- DeviceAdapters/Basler/BaslerPylon.vcxproj | 4 +- .../BaumerOptronic/BaumerOptronic.vcxproj | 4 +- .../BlueboxOptics_niji.vcxproj | 4 +- DeviceAdapters/CARVII/CARVII.vcxproj | 4 +- .../ArduinoNeoPixel.vcxproj | 4 +- .../CNCMicroscope/RAMPSStage/RAMPS.vcxproj | 4 +- DeviceAdapters/CSUW1/CSUW1.vcxproj | 4 +- .../ChuoSeiki_MD5000/ChuoSeiki_MD5000.vcxproj | 4 +- .../ChuoSeiki_QT/ChuoSeiki_QT.vcxproj | 4 +- DeviceAdapters/Cobolt/Cobolt.vcxproj | 4 +- .../CoboltOfficial/CoboltOfficial.vcxproj | 4 +- .../CoherentCube/CoherentCube.vcxproj | 4 +- .../CoherentOBIS/CoherentOBIS.vcxproj | 4 +- .../CoherentScientificRemote.vcxproj | 4 +- DeviceAdapters/Conix/Conix.vcxproj | 4 +- DeviceAdapters/CoolLEDpE300/pE300.vcxproj | 4 +- DeviceAdapters/CoolLEDpE4000/pE4000.vcxproj | 4 +- DeviceAdapters/Corvus/Corvus.vcxproj | 4 +- .../DTOpenLayer/DTOpenLayer.vcxproj | 4 +- DeviceAdapters/DemoCamera/DemoCamera.vcxproj | 4 +- .../vsprojects/DECamera.vcxproj | 4 +- .../vsprojects/DEClientLib.vcxproj | 6 +-- .../vsprojects/DEMessaging.vcxproj | 6 +-- DeviceAdapters/Diskovery/Diskovery.vcxproj | 4 +- DeviceAdapters/Dragonfly/Dragonfly.vcxproj | 4 +- DeviceAdapters/ESP32/ESP32.vcxproj | 4 +- DeviceAdapters/ETL/ETL.vcxproj | 4 +- DeviceAdapters/FLICamera/FLICamera.vcxproj | 4 +- DeviceAdapters/FakeCamera/FakeCamera.vcxproj | 4 +- .../Fli/FirstLightImagingCameras.vcxproj | 4 +- .../FreeSerialPort/FreeSerialPort.vcxproj | 4 +- DeviceAdapters/GenericSLM/GenericSLM.vcxproj | 4 +- DeviceAdapters/GigECamera/GigECamera.vcxproj | 4 +- DeviceAdapters/HIDManager/HIDManager.vcxproj | 4 +- .../HamiltonMVP/HamiltonMVP.vcxproj | 4 +- DeviceAdapters/HydraLMT200/Hydra.vcxproj | 4 +- DeviceAdapters/IDSPeak/IDSPeak.vcxproj | 4 +- DeviceAdapters/IDS_uEye/IDS_uEye.vcxproj | 6 +-- DeviceAdapters/IIDC/IIDC.vcxproj | 4 +- .../IlluminateLEDArray/LEDArray.vcxproj | 4 +- .../ImageProcessorChain.vcxproj | 4 +- .../IntegratedLaserEngine.vcxproj | 4 +- DeviceAdapters/IsmatecMCP/IsmatecMCP.vcxproj | 4 +- DeviceAdapters/JAI/JAI.vcxproj | 4 +- DeviceAdapters/K8055/K8055.vcxproj | 4 +- DeviceAdapters/K8061/K8061.vcxproj | 4 +- DeviceAdapters/KuriosLCTF/KuriosLCTF.vcxproj | 4 +- .../LaserQuantumLaser.vcxproj | 4 +- DeviceAdapters/LeicaDMI/LeicaDMI.vcxproj | 4 +- DeviceAdapters/LeicaDMR/LeicaDMR.vcxproj | 4 +- DeviceAdapters/LeicaDMSTC/LeicaDMSTC.vcxproj | 4 +- .../LightSheetManager.vcxproj | 4 +- DeviceAdapters/Ludl/Ludl.vcxproj | 4 +- DeviceAdapters/LudlLow/LudlLow.vcxproj | 4 +- DeviceAdapters/Lumencor/Lumencor.vcxproj | 4 +- .../LumencorCIA/LumencorCIA.vcxproj | 4 +- .../LumencorSpectra/LumencorSpectra.vcxproj | 4 +- DeviceAdapters/Lumenera/Lumenera.vcxproj | 4 +- DeviceAdapters/MCCDAQ/MCCDAQ.vcxproj | 4 +- .../MCL_MicroDrive/MCL_MicroDrive.vcxproj | 4 +- .../MCL_NanoDrive/MCL_NanoDrive.vcxproj | 4 +- DeviceAdapters/MP285/MP285.vcxproj | 4 +- DeviceAdapters/MPBLaser/MPBLaser.vcxproj | 4 +- DeviceAdapters/MT20/MT20.vcxproj | 4 +- .../MaestroServo/MaestroServo.vcxproj | 4 +- .../Marzhauser-LStep/MarzhauserLStep.vcxproj | 4 +- DeviceAdapters/Marzhauser/Marzhauser.vcxproj | 4 +- .../MarzhauserLStepOld.vcxproj | 4 +- .../MatrixVision/MatrixVision.vcxproj | 4 +- .../MeadowlarkLC/MeadowlarkLC.vcxproj | 4 +- DeviceAdapters/MicroFPGA/MicroFPGA.vcxproj | 4 +- DeviceAdapters/MicroPoint/MicroPoint.vcxproj | 4 +- DeviceAdapters/Mightex/Mightex.vcxproj | 4 +- .../Mightex_BLS/Mightex_BLS.vcxproj | 4 +- .../Mightex_C_Cam/Mightex_C_Cam.vcxproj | 4 +- DeviceAdapters/Modbus/Modbus.vcxproj | 4 +- DeviceAdapters/Motic/MoticCamera.vcxproj | 4 +- .../MoticMicroscope/MoticMicroscope.vcxproj | 4 +- DeviceAdapters/NI100X/NI100X.vcxproj | 4 +- DeviceAdapters/NIDAQ/NIDAQ.vcxproj | 4 +- .../NIMultiAnalog/NIMultiAnalog.vcxproj | 4 +- DeviceAdapters/NKTSuperK/NKTSuperK.vcxproj | 4 +- DeviceAdapters/Neos/Neos.vcxproj | 4 +- .../NewportCONEX/NewportCONEX.vcxproj | 4 +- DeviceAdapters/NewportSMC/NewportSMC.vcxproj | 4 +- DeviceAdapters/Nikon/Nikon.vcxproj | 4 +- .../NikonTE2000/NikonTE2000.vcxproj | 4 +- .../NotificationTester.vcxproj | 4 +- DeviceAdapters/OVP_ECS2/OVP_ECS2.vcxproj | 4 +- .../ObjectiveImaging/ObjectiveImaging.vcxproj | 4 +- DeviceAdapters/Okolab/Okolab.vcxproj | 4 +- DeviceAdapters/Omicron/Omicron.vcxproj | 4 +- .../OpenCVgrabber/OpenCVgrabber.vcxproj | 4 +- DeviceAdapters/Oxxius/Oxxius.vcxproj | 4 +- .../OxxiusCombiner/OxxiusCombiner.vcxproj | 4 +- DeviceAdapters/PCO_Generic/PCO_Camera.vcxproj | 4 +- DeviceAdapters/PI/PI.vcxproj | 4 +- DeviceAdapters/PICAM/PICAM.vcxproj | 4 +- .../PIEZOCONCEPT/PIEZOCONCEPT.vcxproj | 4 +- DeviceAdapters/PI_GCS/PI_GCS.vcxproj | 4 +- DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj | 4 +- .../PI_GCS_2/PI_GCS_2.vcxproj.filters | 3 ++ DeviceAdapters/PVCAM/PVCAM.vcxproj | 4 +- .../ParallelPort/ParallelPort.vcxproj | 4 +- DeviceAdapters/PeCon2000/PeCon2000.vcxproj | 4 +- DeviceAdapters/Pecon/Pecon.vcxproj | 4 +- .../PicardStage/PicardStage.vcxproj | 4 +- .../Piezosystem_30DV50.vcxproj | 4 +- .../Piezosystem_NV120_1.vcxproj | 4 +- .../Piezosystem_NV40_1.vcxproj | 4 +- .../Piezosystem_NV40_3.vcxproj | 4 +- .../Piezosystem_dDrive.vcxproj | 4 +- DeviceAdapters/Piper/Piper.vcxproj | 4 +- DeviceAdapters/Pixelink/Pixelink.vcxproj | 4 +- DeviceAdapters/PointGrey/PointGrey.vcxproj | 4 +- .../PrecisExcite/PrecisExcite.vcxproj | 4 +- DeviceAdapters/Prior/Prior.vcxproj | 4 +- .../PriorLegacy/PriorLegacy.vcxproj | 4 +- .../PrizmatixDevice/PrizmatixDevice.vcxproj | 4 +- DeviceAdapters/QCam/QCam.vcxproj | 4 +- DeviceAdapters/QSI/QSI.vcxproj | 6 +-- DeviceAdapters/Rapp/Rapp.vcxproj | 6 +-- DeviceAdapters/RaptorEPIX/HoribaEPIX.vcxproj | 4 +- DeviceAdapters/RaptorEPIX/RaptorEPIX.vcxproj | 4 +- DeviceAdapters/Sapphire/Sapphire.vcxproj | 4 +- .../Scientifica/Scientifica.vcxproj | 4 +- DeviceAdapters/ScopeLED/ScopeLED.vcxproj | 4 +- .../SequenceTester/SequenceTester.vcxproj | 4 +- .../SerialManager/SerialManager.vcxproj | 4 +- DeviceAdapters/SigmaKoki/SigmaKoki.vcxproj | 4 +- DeviceAdapters/Skyra/Skyra.vcxproj | 4 +- .../SmarActHCU-3D/SmarActHCU-3D.vcxproj | 4 +- DeviceAdapters/SouthPort/SouthPort.vcxproj | 4 +- .../SpectralLMM5/SpectralLMM5.vcxproj | 4 +- .../Spinnaker/SpinnakerCamera.vcxproj | 4 +- DeviceAdapters/Standa/Standa.vcxproj | 4 +- .../Standa8SMC4/Standa8SMC4.vcxproj | 4 +- .../StandaStage/StandaStage.vcxproj | 4 +- .../StarlightXpress/StarlightXpress.vcxproj | 4 +- .../SutterLambda/SutterLambda.vcxproj | 6 +-- .../SutterLambda2/SutterLambda2.vcxproj | 4 +- .../SutterLambdaParallelArduino.vcxproj | 4 +- .../SutterStage/SutterStage.vcxproj | 4 +- DeviceAdapters/TCPIPPort/TCPIPPort.vcxproj | 4 +- DeviceAdapters/TISCam/TIScam.vcxproj | 4 +- DeviceAdapters/TSI/TSI.vcxproj | 4 +- DeviceAdapters/TUCam/MMTUCam.vcxproj | 4 +- DeviceAdapters/TeesnySLM/TeensySLM.vcxproj | 4 +- DeviceAdapters/Thorlabs/Thorlabs.vcxproj | 4 +- .../ThorlabsAPTStage/ThorlabsAPTStage.vcxproj | 4 +- .../ThorlabsCHROLIS/ThorlabsCHROLIS.vcxproj | 4 +- .../ThorlabsDCxxxx/ThorlabsDCxxxx.vcxproj | 4 +- .../ThorlabsElliptecSlider.vcxproj | 4 +- .../ThorlabsFilterWheel.vcxproj | 4 +- .../ThorlabsPM100x/ThorlabsPM100x.vcxproj | 4 +- .../ThorlabsSC10/ThorlabsSC10.vcxproj | 4 +- .../ThorlabsUSBCamera.vcxproj | 4 +- .../Thorlabs_ELL14/Thorlabs_ELL14.vcxproj | 4 +- DeviceAdapters/Tofra/Tofra.vcxproj | 4 +- .../Toptica_iBeamSmartCW.vcxproj | 4 +- .../TriggerScope/TriggerScope.vcxproj | 4 +- .../TriggerScopeMM/TriggerScopeMM.vcxproj | 4 +- .../TwainCamera/TwainCamera.vcxproj | 4 +- DeviceAdapters/TwoPhoton/TwoPhoton.vcxproj | 4 +- DeviceAdapters/USBManager/USBManager.vcxproj | 4 +- .../USB_Viper_QPL/USB_Viper_QPL.vcxproj | 4 +- .../UniversalMMHubSerial.vcxproj | 4 +- .../UniversalMMHubUsb.vcxproj | 4 +- .../UserDefinedSerial.vcxproj | 4 +- DeviceAdapters/Utilities/Utilities.vcxproj | 4 +- .../Utilities/Utilities.vcxproj.filters | 45 +++++++++++++++++++ DeviceAdapters/VariLC/VariLC.vcxproj | 4 +- .../VarispecLCTF/VarispecLCTF.vcxproj | 4 +- DeviceAdapters/Vincent/Vincent.vcxproj | 4 +- .../VisiTech_iSIM/VisiTech_iSIM.vcxproj | 4 +- DeviceAdapters/Vortran/Stradus.vcxproj | 4 +- DeviceAdapters/Vortran/VersaLase.vcxproj | 4 +- DeviceAdapters/WOSM/WOSM.vcxproj | 4 +- .../WieneckeSinske/WieneckeSinske.vcxproj | 4 +- .../XCite120PC_Exacte.vcxproj | 4 +- DeviceAdapters/XCiteLed/XCiteLed.vcxproj | 4 +- DeviceAdapters/XCiteXT600/XCiteXT600.vcxproj | 4 +- DeviceAdapters/XLight/XLight.vcxproj | 4 +- DeviceAdapters/XLightV3/XLightV3.vcxproj | 4 +- DeviceAdapters/Xcite/Xcite.vcxproj | 4 +- DeviceAdapters/Ximea/XIMEACamera.vcxproj | 4 +- DeviceAdapters/YodnE600/YodnE600.vcxproj | 4 +- DeviceAdapters/Yokogawa/CSUX/CSUX.vcxproj | 4 +- DeviceAdapters/Yokogawa/Yokogawa.vcxproj | 4 +- DeviceAdapters/ZWO/ZWO.vcxproj | 4 +- DeviceAdapters/Zaber/Zaber.vcxproj | 4 +- .../ZeissAxioZoom/ZeissAxioZoom.vcxproj | 4 +- DeviceAdapters/ZeissCAN/ZeissCAN.vcxproj | 4 +- DeviceAdapters/ZeissCAN29/ZeissCAN29.vcxproj | 4 +- DeviceAdapters/dc1394/dc1394.vcxproj | 4 +- DeviceAdapters/kdv/KDV.vcxproj | 4 +- DeviceAdapters/nPoint/NPointC400.vcxproj | 4 +- DeviceAdapters/pgFocus/pgFocus.vcxproj | 4 +- MMCore/MMCore.vcxproj | 6 +-- MMCoreJ_wrap/MMCoreJ_wrap.vcxproj | 6 +-- MMDevice/MMDevice-SharedRuntime.vcxproj | 6 +-- MMDevice/MMDevice-StaticRuntime.vcxproj | 6 +-- micromanagerSD.slnf | 12 +++++ 226 files changed, 519 insertions(+), 459 deletions(-) create mode 100644 micromanagerSD.slnf diff --git a/DeviceAdapters/89NorthLDI/89North_LDI.vcxproj b/DeviceAdapters/89NorthLDI/89North_LDI.vcxproj index 23fe9b2e1..580efffec 100644 --- a/DeviceAdapters/89NorthLDI/89North_LDI.vcxproj +++ b/DeviceAdapters/89NorthLDI/89North_LDI.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/AAAOTF/AAAOTF.vcxproj b/DeviceAdapters/AAAOTF/AAAOTF.vcxproj index 94a8c28a2..9369a217a 100644 --- a/DeviceAdapters/AAAOTF/AAAOTF.vcxproj +++ b/DeviceAdapters/AAAOTF/AAAOTF.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ABS/ABSCamera.vcxproj b/DeviceAdapters/ABS/ABSCamera.vcxproj index 3de213e3a..ddd620d75 100644 --- a/DeviceAdapters/ABS/ABSCamera.vcxproj +++ b/DeviceAdapters/ABS/ABSCamera.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/AOTF/AOTF.vcxproj b/DeviceAdapters/AOTF/AOTF.vcxproj index 4cc840963..32fda92f8 100644 --- a/DeviceAdapters/AOTF/AOTF.vcxproj +++ b/DeviceAdapters/AOTF/AOTF.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ASIFW1000/ASIFW1000.vcxproj b/DeviceAdapters/ASIFW1000/ASIFW1000.vcxproj index 5c01acc5f..28dc0280b 100644 --- a/DeviceAdapters/ASIFW1000/ASIFW1000.vcxproj +++ b/DeviceAdapters/ASIFW1000/ASIFW1000.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ASIStage/ASIStage.vcxproj b/DeviceAdapters/ASIStage/ASIStage.vcxproj index 5e316356d..91a9f4401 100644 --- a/DeviceAdapters/ASIStage/ASIStage.vcxproj +++ b/DeviceAdapters/ASIStage/ASIStage.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true @@ -124,4 +124,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/ASITiger/ASITiger.vcxproj b/DeviceAdapters/ASITiger/ASITiger.vcxproj index d6f9b5dee..727d67e90 100644 --- a/DeviceAdapters/ASITiger/ASITiger.vcxproj +++ b/DeviceAdapters/ASITiger/ASITiger.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true @@ -136,4 +136,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/ASIWPTR/ASIwptr.vcxproj b/DeviceAdapters/ASIWPTR/ASIwptr.vcxproj index b4974caf5..b0355d1ed 100644 --- a/DeviceAdapters/ASIWPTR/ASIwptr.vcxproj +++ b/DeviceAdapters/ASIWPTR/ASIwptr.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.vcxproj b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.vcxproj index 8366720b3..7785dcafc 100644 --- a/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.vcxproj +++ b/DeviceAdapters/AgilentLaserCombiner/AgilentLaserCombiner.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Aladdin/Aladdin.vcxproj b/DeviceAdapters/Aladdin/Aladdin.vcxproj index 99f316a12..c7b0e62cf 100644 --- a/DeviceAdapters/Aladdin/Aladdin.vcxproj +++ b/DeviceAdapters/Aladdin/Aladdin.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.vcxproj b/DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.vcxproj index 1aa16787b..2de89f15f 100644 --- a/DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.vcxproj +++ b/DeviceAdapters/AlliedVisionCamera/AlliedVisionCamera.vcxproj @@ -39,13 +39,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/AmScope/AmScope.vcxproj b/DeviceAdapters/AmScope/AmScope.vcxproj index 49ed05569..e89ccad9f 100644 --- a/DeviceAdapters/AmScope/AmScope.vcxproj +++ b/DeviceAdapters/AmScope/AmScope.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false false MultiByte - v142 + v143 diff --git a/DeviceAdapters/Andor/Andor.vcxproj b/DeviceAdapters/Andor/Andor.vcxproj index f2b158b08..d854e4663 100644 --- a/DeviceAdapters/Andor/Andor.vcxproj +++ b/DeviceAdapters/Andor/Andor.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.vcxproj b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.vcxproj index 0f40d9fa5..5077bdd78 100644 --- a/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.vcxproj +++ b/DeviceAdapters/AndorLaserCombiner/AndorLaserCombiner.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/AndorSDK3/AndorSDK3.vcxproj b/DeviceAdapters/AndorSDK3/AndorSDK3.vcxproj index 6b0b25608..38237c1e5 100644 --- a/DeviceAdapters/AndorSDK3/AndorSDK3.vcxproj +++ b/DeviceAdapters/AndorSDK3/AndorSDK3.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/AndorShamrock/AndorShamrock.vcxproj b/DeviceAdapters/AndorShamrock/AndorShamrock.vcxproj index 4f7dd0d60..35b56121b 100755 --- a/DeviceAdapters/AndorShamrock/AndorShamrock.vcxproj +++ b/DeviceAdapters/AndorShamrock/AndorShamrock.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Aquinas/Aquinas.vcxproj b/DeviceAdapters/Aquinas/Aquinas.vcxproj index 87969e1d4..85374042c 100644 --- a/DeviceAdapters/Aquinas/Aquinas.vcxproj +++ b/DeviceAdapters/Aquinas/Aquinas.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/Arduino/Arduino.vcxproj b/DeviceAdapters/Arduino/Arduino.vcxproj index 4cd4566bc..26f80dcf3 100644 --- a/DeviceAdapters/Arduino/Arduino.vcxproj +++ b/DeviceAdapters/Arduino/Arduino.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.vcxproj b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.vcxproj index efb53fdf6..77e21c6df 100644 --- a/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.vcxproj +++ b/DeviceAdapters/Arduino32bitBoards/Arduino32bitBoards.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ArduinoCounter/ArduinoCounter.vcxproj b/DeviceAdapters/ArduinoCounter/ArduinoCounter.vcxproj index 7c73b01d5..1726f50bc 100644 --- a/DeviceAdapters/ArduinoCounter/ArduinoCounter.vcxproj +++ b/DeviceAdapters/ArduinoCounter/ArduinoCounter.vcxproj @@ -11,7 +11,7 @@ - {067D4A8-8C32-40D3-BA9F-6B388ECCD714} + {0067D4A8-0000-0000-0000-000000000000} Arduino 10.0 @@ -20,13 +20,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Atik/AtikCamera.vcxproj b/DeviceAdapters/Atik/AtikCamera.vcxproj index c53fc01ef..f32a11373 100644 --- a/DeviceAdapters/Atik/AtikCamera.vcxproj +++ b/DeviceAdapters/Atik/AtikCamera.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/BDPathway/BDPathway.vcxproj b/DeviceAdapters/BDPathway/BDPathway.vcxproj index 48e2b735d..869bd9b6b 100644 --- a/DeviceAdapters/BDPathway/BDPathway.vcxproj +++ b/DeviceAdapters/BDPathway/BDPathway.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/BH_DCC_DCU/BH_DCC_DCU.vcxproj b/DeviceAdapters/BH_DCC_DCU/BH_DCC_DCU.vcxproj index 778cd1b5d..c74c11cd2 100644 --- a/DeviceAdapters/BH_DCC_DCU/BH_DCC_DCU.vcxproj +++ b/DeviceAdapters/BH_DCC_DCU/BH_DCC_DCU.vcxproj @@ -36,13 +36,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/Basler/BaslerPylon.vcxproj b/DeviceAdapters/Basler/BaslerPylon.vcxproj index 6887a2011..39c790ba3 100644 --- a/DeviceAdapters/Basler/BaslerPylon.vcxproj +++ b/DeviceAdapters/Basler/BaslerPylon.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/BaumerOptronic/BaumerOptronic.vcxproj b/DeviceAdapters/BaumerOptronic/BaumerOptronic.vcxproj index 1c2f9a3f5..623a2e07c 100644 --- a/DeviceAdapters/BaumerOptronic/BaumerOptronic.vcxproj +++ b/DeviceAdapters/BaumerOptronic/BaumerOptronic.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/BlueboxOptics_niji/BlueboxOptics_niji.vcxproj b/DeviceAdapters/BlueboxOptics_niji/BlueboxOptics_niji.vcxproj index cf046bc20..dde4878bf 100644 --- a/DeviceAdapters/BlueboxOptics_niji/BlueboxOptics_niji.vcxproj +++ b/DeviceAdapters/BlueboxOptics_niji/BlueboxOptics_niji.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/CARVII/CARVII.vcxproj b/DeviceAdapters/CARVII/CARVII.vcxproj index 22f15d7be..d8ecdc3ea 100644 --- a/DeviceAdapters/CARVII/CARVII.vcxproj +++ b/DeviceAdapters/CARVII/CARVII.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixel.vcxproj b/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixel.vcxproj index 14d037163..5379b8636 100644 --- a/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixel.vcxproj +++ b/DeviceAdapters/CNCMicroscope/ArduinoNeoPixelShutter/ArduinoNeoPixel.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/CNCMicroscope/RAMPSStage/RAMPS.vcxproj b/DeviceAdapters/CNCMicroscope/RAMPSStage/RAMPS.vcxproj index 1ae6fe210..b6e8bede3 100644 --- a/DeviceAdapters/CNCMicroscope/RAMPSStage/RAMPS.vcxproj +++ b/DeviceAdapters/CNCMicroscope/RAMPSStage/RAMPS.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/CSUW1/CSUW1.vcxproj b/DeviceAdapters/CSUW1/CSUW1.vcxproj index 126183015..cc1771a64 100644 --- a/DeviceAdapters/CSUW1/CSUW1.vcxproj +++ b/DeviceAdapters/CSUW1/CSUW1.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD5000.vcxproj b/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD5000.vcxproj index 74e893589..443903f01 100644 --- a/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD5000.vcxproj +++ b/DeviceAdapters/ChuoSeiki_MD5000/ChuoSeiki_MD5000.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false false Unicode - v142 + v143 diff --git a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT.vcxproj b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT.vcxproj index 1aad1c44a..d1178a235 100644 --- a/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT.vcxproj +++ b/DeviceAdapters/ChuoSeiki_QT/ChuoSeiki_QT.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Cobolt/Cobolt.vcxproj b/DeviceAdapters/Cobolt/Cobolt.vcxproj index ed40fb2bf..7eb308896 100644 --- a/DeviceAdapters/Cobolt/Cobolt.vcxproj +++ b/DeviceAdapters/Cobolt/Cobolt.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary NotSet - v142 + v143 false DynamicLibrary NotSet - v142 + v143 true diff --git a/DeviceAdapters/CoboltOfficial/CoboltOfficial.vcxproj b/DeviceAdapters/CoboltOfficial/CoboltOfficial.vcxproj index c72d40364..3360f6e6b 100644 --- a/DeviceAdapters/CoboltOfficial/CoboltOfficial.vcxproj +++ b/DeviceAdapters/CoboltOfficial/CoboltOfficial.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/CoherentCube/CoherentCube.vcxproj b/DeviceAdapters/CoherentCube/CoherentCube.vcxproj index b12fd7fc7..99ec1f286 100644 --- a/DeviceAdapters/CoherentCube/CoherentCube.vcxproj +++ b/DeviceAdapters/CoherentCube/CoherentCube.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/CoherentOBIS/CoherentOBIS.vcxproj b/DeviceAdapters/CoherentOBIS/CoherentOBIS.vcxproj index dcd8a6e52..abc737923 100644 --- a/DeviceAdapters/CoherentOBIS/CoherentOBIS.vcxproj +++ b/DeviceAdapters/CoherentOBIS/CoherentOBIS.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.vcxproj b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.vcxproj index 1778fe481..8b1c814ae 100644 --- a/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.vcxproj +++ b/DeviceAdapters/CoherentScientificRemote/CoherentScientificRemote.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Conix/Conix.vcxproj b/DeviceAdapters/Conix/Conix.vcxproj index c12d473c2..9e697d01d 100644 --- a/DeviceAdapters/Conix/Conix.vcxproj +++ b/DeviceAdapters/Conix/Conix.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/CoolLEDpE300/pE300.vcxproj b/DeviceAdapters/CoolLEDpE300/pE300.vcxproj index ee1ac8388..5a240a7a1 100644 --- a/DeviceAdapters/CoolLEDpE300/pE300.vcxproj +++ b/DeviceAdapters/CoolLEDpE300/pE300.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/CoolLEDpE4000/pE4000.vcxproj b/DeviceAdapters/CoolLEDpE4000/pE4000.vcxproj index 3eae4bafa..2b4015b07 100644 --- a/DeviceAdapters/CoolLEDpE4000/pE4000.vcxproj +++ b/DeviceAdapters/CoolLEDpE4000/pE4000.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Corvus/Corvus.vcxproj b/DeviceAdapters/Corvus/Corvus.vcxproj index eba0ee6b9..a395a0479 100644 --- a/DeviceAdapters/Corvus/Corvus.vcxproj +++ b/DeviceAdapters/Corvus/Corvus.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/DTOpenLayer/DTOpenLayer.vcxproj b/DeviceAdapters/DTOpenLayer/DTOpenLayer.vcxproj index 6e3e9e09b..db94da919 100644 --- a/DeviceAdapters/DTOpenLayer/DTOpenLayer.vcxproj +++ b/DeviceAdapters/DTOpenLayer/DTOpenLayer.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/DemoCamera/DemoCamera.vcxproj b/DeviceAdapters/DemoCamera/DemoCamera.vcxproj index d33d57348..67f5c80d5 100644 --- a/DeviceAdapters/DemoCamera/DemoCamera.vcxproj +++ b/DeviceAdapters/DemoCamera/DemoCamera.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/DirectElectron/vsprojects/DECamera.vcxproj b/DeviceAdapters/DirectElectron/vsprojects/DECamera.vcxproj index ffd6e9b6b..bc8b63b77 100644 --- a/DeviceAdapters/DirectElectron/vsprojects/DECamera.vcxproj +++ b/DeviceAdapters/DirectElectron/vsprojects/DECamera.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/DirectElectron/vsprojects/DEClientLib.vcxproj b/DeviceAdapters/DirectElectron/vsprojects/DEClientLib.vcxproj index 2efd13095..3aa7bb6d6 100644 --- a/DeviceAdapters/DirectElectron/vsprojects/DEClientLib.vcxproj +++ b/DeviceAdapters/DirectElectron/vsprojects/DEClientLib.vcxproj @@ -20,13 +20,13 @@ StaticLibrary Unicode - v142 + v143 false StaticLibrary Unicode - v142 + v143 true @@ -97,4 +97,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/DirectElectron/vsprojects/DEMessaging.vcxproj b/DeviceAdapters/DirectElectron/vsprojects/DEMessaging.vcxproj index 20bfd106c..6efb50877 100644 --- a/DeviceAdapters/DirectElectron/vsprojects/DEMessaging.vcxproj +++ b/DeviceAdapters/DirectElectron/vsprojects/DEMessaging.vcxproj @@ -20,13 +20,13 @@ StaticLibrary Unicode - v142 + v143 false StaticLibrary Unicode - v142 + v143 true @@ -106,4 +106,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/Diskovery/Diskovery.vcxproj b/DeviceAdapters/Diskovery/Diskovery.vcxproj index 9d537e7db..26a62bb34 100644 --- a/DeviceAdapters/Diskovery/Diskovery.vcxproj +++ b/DeviceAdapters/Diskovery/Diskovery.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Dragonfly/Dragonfly.vcxproj b/DeviceAdapters/Dragonfly/Dragonfly.vcxproj index 94dea928e..f07e24ad2 100644 --- a/DeviceAdapters/Dragonfly/Dragonfly.vcxproj +++ b/DeviceAdapters/Dragonfly/Dragonfly.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ESP32/ESP32.vcxproj b/DeviceAdapters/ESP32/ESP32.vcxproj index cfbd67cdd..de65f1311 100644 --- a/DeviceAdapters/ESP32/ESP32.vcxproj +++ b/DeviceAdapters/ESP32/ESP32.vcxproj @@ -32,13 +32,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/ETL/ETL.vcxproj b/DeviceAdapters/ETL/ETL.vcxproj index 0a8350c0f..824dc4ee7 100644 --- a/DeviceAdapters/ETL/ETL.vcxproj +++ b/DeviceAdapters/ETL/ETL.vcxproj @@ -32,13 +32,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/FLICamera/FLICamera.vcxproj b/DeviceAdapters/FLICamera/FLICamera.vcxproj index ab3d95c9f..52641a83e 100644 --- a/DeviceAdapters/FLICamera/FLICamera.vcxproj +++ b/DeviceAdapters/FLICamera/FLICamera.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/FakeCamera/FakeCamera.vcxproj b/DeviceAdapters/FakeCamera/FakeCamera.vcxproj index 5f17ae5a0..f86688b60 100644 --- a/DeviceAdapters/FakeCamera/FakeCamera.vcxproj +++ b/DeviceAdapters/FakeCamera/FakeCamera.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Fli/FirstLightImagingCameras.vcxproj b/DeviceAdapters/Fli/FirstLightImagingCameras.vcxproj index 97d40631b..b54e4d9b7 100644 --- a/DeviceAdapters/Fli/FirstLightImagingCameras.vcxproj +++ b/DeviceAdapters/Fli/FirstLightImagingCameras.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/FreeSerialPort/FreeSerialPort.vcxproj b/DeviceAdapters/FreeSerialPort/FreeSerialPort.vcxproj index 895843efb..1bebbbc19 100644 --- a/DeviceAdapters/FreeSerialPort/FreeSerialPort.vcxproj +++ b/DeviceAdapters/FreeSerialPort/FreeSerialPort.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/GenericSLM/GenericSLM.vcxproj b/DeviceAdapters/GenericSLM/GenericSLM.vcxproj index 25c64c9d9..7d5e256c5 100644 --- a/DeviceAdapters/GenericSLM/GenericSLM.vcxproj +++ b/DeviceAdapters/GenericSLM/GenericSLM.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/GigECamera/GigECamera.vcxproj b/DeviceAdapters/GigECamera/GigECamera.vcxproj index 292d8ccc0..7f7b8d4b1 100644 --- a/DeviceAdapters/GigECamera/GigECamera.vcxproj +++ b/DeviceAdapters/GigECamera/GigECamera.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/HIDManager/HIDManager.vcxproj b/DeviceAdapters/HIDManager/HIDManager.vcxproj index c7619795b..7b6cf3a8c 100644 --- a/DeviceAdapters/HIDManager/HIDManager.vcxproj +++ b/DeviceAdapters/HIDManager/HIDManager.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/HamiltonMVP/HamiltonMVP.vcxproj b/DeviceAdapters/HamiltonMVP/HamiltonMVP.vcxproj index 321c9c0b6..ae7e5c341 100644 --- a/DeviceAdapters/HamiltonMVP/HamiltonMVP.vcxproj +++ b/DeviceAdapters/HamiltonMVP/HamiltonMVP.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/HydraLMT200/Hydra.vcxproj b/DeviceAdapters/HydraLMT200/Hydra.vcxproj index d1bd18c01..66854c804 100644 --- a/DeviceAdapters/HydraLMT200/Hydra.vcxproj +++ b/DeviceAdapters/HydraLMT200/Hydra.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/IDSPeak/IDSPeak.vcxproj b/DeviceAdapters/IDSPeak/IDSPeak.vcxproj index 95c7f99e3..431e2f805 100644 --- a/DeviceAdapters/IDSPeak/IDSPeak.vcxproj +++ b/DeviceAdapters/IDSPeak/IDSPeak.vcxproj @@ -35,13 +35,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/IDS_uEye/IDS_uEye.vcxproj b/DeviceAdapters/IDS_uEye/IDS_uEye.vcxproj index bb8eaf744..9e459879a 100644 --- a/DeviceAdapters/IDS_uEye/IDS_uEye.vcxproj +++ b/DeviceAdapters/IDS_uEye/IDS_uEye.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true @@ -102,4 +102,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/IIDC/IIDC.vcxproj b/DeviceAdapters/IIDC/IIDC.vcxproj index aaf3284c3..19eb2265b 100644 --- a/DeviceAdapters/IIDC/IIDC.vcxproj +++ b/DeviceAdapters/IIDC/IIDC.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false Unicode - v142 + v143 diff --git a/DeviceAdapters/IlluminateLEDArray/LEDArray.vcxproj b/DeviceAdapters/IlluminateLEDArray/LEDArray.vcxproj index 4c49f2a70..5471bccf6 100644 --- a/DeviceAdapters/IlluminateLEDArray/LEDArray.vcxproj +++ b/DeviceAdapters/IlluminateLEDArray/LEDArray.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.vcxproj b/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.vcxproj index e97daa27c..6d7b879c1 100644 --- a/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.vcxproj +++ b/DeviceAdapters/ImageProcessorChain/ImageProcessorChain.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.vcxproj b/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.vcxproj index a021d2ebb..b2fb25807 100644 --- a/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.vcxproj +++ b/DeviceAdapters/IntegratedLaserEngine/IntegratedLaserEngine.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/IsmatecMCP/IsmatecMCP.vcxproj b/DeviceAdapters/IsmatecMCP/IsmatecMCP.vcxproj index cd3180593..a0bf24f24 100644 --- a/DeviceAdapters/IsmatecMCP/IsmatecMCP.vcxproj +++ b/DeviceAdapters/IsmatecMCP/IsmatecMCP.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/JAI/JAI.vcxproj b/DeviceAdapters/JAI/JAI.vcxproj index 999abf8b5..2bb018861 100644 --- a/DeviceAdapters/JAI/JAI.vcxproj +++ b/DeviceAdapters/JAI/JAI.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/K8055/K8055.vcxproj b/DeviceAdapters/K8055/K8055.vcxproj index fe862a340..d572c5a7e 100644 --- a/DeviceAdapters/K8055/K8055.vcxproj +++ b/DeviceAdapters/K8055/K8055.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary NotSet true - v142 + v143 false DynamicLibrary NotSet - v142 + v143 true diff --git a/DeviceAdapters/K8061/K8061.vcxproj b/DeviceAdapters/K8061/K8061.vcxproj index 34ade99ff..605ec644c 100644 --- a/DeviceAdapters/K8061/K8061.vcxproj +++ b/DeviceAdapters/K8061/K8061.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/KuriosLCTF/KuriosLCTF.vcxproj b/DeviceAdapters/KuriosLCTF/KuriosLCTF.vcxproj index 1b134e9c9..832ae4d4b 100644 --- a/DeviceAdapters/KuriosLCTF/KuriosLCTF.vcxproj +++ b/DeviceAdapters/KuriosLCTF/KuriosLCTF.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.vcxproj b/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.vcxproj index 043ae77b1..c857bbe23 100644 --- a/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.vcxproj +++ b/DeviceAdapters/LaserQuantumLaser/LaserQuantumLaser.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LeicaDMI/LeicaDMI.vcxproj b/DeviceAdapters/LeicaDMI/LeicaDMI.vcxproj index 887b9b6f2..8d768ad4d 100644 --- a/DeviceAdapters/LeicaDMI/LeicaDMI.vcxproj +++ b/DeviceAdapters/LeicaDMI/LeicaDMI.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LeicaDMR/LeicaDMR.vcxproj b/DeviceAdapters/LeicaDMR/LeicaDMR.vcxproj index af4c61796..58d6fcc53 100644 --- a/DeviceAdapters/LeicaDMR/LeicaDMR.vcxproj +++ b/DeviceAdapters/LeicaDMR/LeicaDMR.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.vcxproj b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.vcxproj index e3b42ae2d..8188da47b 100644 --- a/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.vcxproj +++ b/DeviceAdapters/LeicaDMSTC/LeicaDMSTC.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LightSheetManager/LightSheetManager.vcxproj b/DeviceAdapters/LightSheetManager/LightSheetManager.vcxproj index 0ad3ea46b..f826188e4 100644 --- a/DeviceAdapters/LightSheetManager/LightSheetManager.vcxproj +++ b/DeviceAdapters/LightSheetManager/LightSheetManager.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Ludl/Ludl.vcxproj b/DeviceAdapters/Ludl/Ludl.vcxproj index 0d5690b51..b94fdf0c4 100644 --- a/DeviceAdapters/Ludl/Ludl.vcxproj +++ b/DeviceAdapters/Ludl/Ludl.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LudlLow/LudlLow.vcxproj b/DeviceAdapters/LudlLow/LudlLow.vcxproj index 28c8b1955..893776672 100644 --- a/DeviceAdapters/LudlLow/LudlLow.vcxproj +++ b/DeviceAdapters/LudlLow/LudlLow.vcxproj @@ -19,13 +19,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Lumencor/Lumencor.vcxproj b/DeviceAdapters/Lumencor/Lumencor.vcxproj index 9c65d2d99..0d3a50abc 100644 --- a/DeviceAdapters/Lumencor/Lumencor.vcxproj +++ b/DeviceAdapters/Lumencor/Lumencor.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LumencorCIA/LumencorCIA.vcxproj b/DeviceAdapters/LumencorCIA/LumencorCIA.vcxproj index d01624337..4fec1ee4f 100644 --- a/DeviceAdapters/LumencorCIA/LumencorCIA.vcxproj +++ b/DeviceAdapters/LumencorCIA/LumencorCIA.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/LumencorSpectra/LumencorSpectra.vcxproj b/DeviceAdapters/LumencorSpectra/LumencorSpectra.vcxproj index f5a0adb18..8bfdf9eb2 100644 --- a/DeviceAdapters/LumencorSpectra/LumencorSpectra.vcxproj +++ b/DeviceAdapters/LumencorSpectra/LumencorSpectra.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Lumenera/Lumenera.vcxproj b/DeviceAdapters/Lumenera/Lumenera.vcxproj index dea13c7f1..186af0299 100644 --- a/DeviceAdapters/Lumenera/Lumenera.vcxproj +++ b/DeviceAdapters/Lumenera/Lumenera.vcxproj @@ -34,13 +34,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/MCCDAQ/MCCDAQ.vcxproj b/DeviceAdapters/MCCDAQ/MCCDAQ.vcxproj index 57d213f8a..69e2a6e8a 100644 --- a/DeviceAdapters/MCCDAQ/MCCDAQ.vcxproj +++ b/DeviceAdapters/MCCDAQ/MCCDAQ.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.vcxproj b/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.vcxproj index c2b0d4359..1544ba826 100644 --- a/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.vcxproj +++ b/DeviceAdapters/MCL_MicroDrive/MCL_MicroDrive.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.vcxproj b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.vcxproj index 3bb8f546f..826aecffc 100644 --- a/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.vcxproj +++ b/DeviceAdapters/MCL_NanoDrive/MCL_NanoDrive.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MP285/MP285.vcxproj b/DeviceAdapters/MP285/MP285.vcxproj index 3bfd70041..96a34e905 100644 --- a/DeviceAdapters/MP285/MP285.vcxproj +++ b/DeviceAdapters/MP285/MP285.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary MultiByte false - v142 + v143 false DynamicLibrary MultiByte false - v142 + v143 true diff --git a/DeviceAdapters/MPBLaser/MPBLaser.vcxproj b/DeviceAdapters/MPBLaser/MPBLaser.vcxproj index 8dda7965e..7a8af85ae 100644 --- a/DeviceAdapters/MPBLaser/MPBLaser.vcxproj +++ b/DeviceAdapters/MPBLaser/MPBLaser.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/MT20/MT20.vcxproj b/DeviceAdapters/MT20/MT20.vcxproj index 191021525..0de543e6e 100644 --- a/DeviceAdapters/MT20/MT20.vcxproj +++ b/DeviceAdapters/MT20/MT20.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MaestroServo/MaestroServo.vcxproj b/DeviceAdapters/MaestroServo/MaestroServo.vcxproj index 902cb3cfe..64bb221bb 100644 --- a/DeviceAdapters/MaestroServo/MaestroServo.vcxproj +++ b/DeviceAdapters/MaestroServo/MaestroServo.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Marzhauser-LStep/MarzhauserLStep.vcxproj b/DeviceAdapters/Marzhauser-LStep/MarzhauserLStep.vcxproj index fa2e03ee6..b1c64d771 100644 --- a/DeviceAdapters/Marzhauser-LStep/MarzhauserLStep.vcxproj +++ b/DeviceAdapters/Marzhauser-LStep/MarzhauserLStep.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Marzhauser/Marzhauser.vcxproj b/DeviceAdapters/Marzhauser/Marzhauser.vcxproj index fcb356a89..20e312f55 100644 --- a/DeviceAdapters/Marzhauser/Marzhauser.vcxproj +++ b/DeviceAdapters/Marzhauser/Marzhauser.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MarzhauserLStepOld/MarzhauserLStepOld.vcxproj b/DeviceAdapters/MarzhauserLStepOld/MarzhauserLStepOld.vcxproj index 370749962..6dce28e8b 100644 --- a/DeviceAdapters/MarzhauserLStepOld/MarzhauserLStepOld.vcxproj +++ b/DeviceAdapters/MarzhauserLStepOld/MarzhauserLStepOld.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/MatrixVision/MatrixVision.vcxproj b/DeviceAdapters/MatrixVision/MatrixVision.vcxproj index aa1dcc218..b943002dd 100644 --- a/DeviceAdapters/MatrixVision/MatrixVision.vcxproj +++ b/DeviceAdapters/MatrixVision/MatrixVision.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/MeadowlarkLC/MeadowlarkLC.vcxproj b/DeviceAdapters/MeadowlarkLC/MeadowlarkLC.vcxproj index f8ac1f3fc..b5ccf14ff 100644 --- a/DeviceAdapters/MeadowlarkLC/MeadowlarkLC.vcxproj +++ b/DeviceAdapters/MeadowlarkLC/MeadowlarkLC.vcxproj @@ -35,13 +35,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/MicroFPGA/MicroFPGA.vcxproj b/DeviceAdapters/MicroFPGA/MicroFPGA.vcxproj index 169a838af..597536cfe 100644 --- a/DeviceAdapters/MicroFPGA/MicroFPGA.vcxproj +++ b/DeviceAdapters/MicroFPGA/MicroFPGA.vcxproj @@ -34,13 +34,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MicroPoint/MicroPoint.vcxproj b/DeviceAdapters/MicroPoint/MicroPoint.vcxproj index be9ab365e..ca33d0384 100644 --- a/DeviceAdapters/MicroPoint/MicroPoint.vcxproj +++ b/DeviceAdapters/MicroPoint/MicroPoint.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Mightex/Mightex.vcxproj b/DeviceAdapters/Mightex/Mightex.vcxproj index bf3db316d..a5e06df46 100644 --- a/DeviceAdapters/Mightex/Mightex.vcxproj +++ b/DeviceAdapters/Mightex/Mightex.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Mightex_BLS/Mightex_BLS.vcxproj b/DeviceAdapters/Mightex_BLS/Mightex_BLS.vcxproj index 2bdba5ef4..ab884c39a 100644 --- a/DeviceAdapters/Mightex_BLS/Mightex_BLS.vcxproj +++ b/DeviceAdapters/Mightex_BLS/Mightex_BLS.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Mightex_C_Cam/Mightex_C_Cam.vcxproj b/DeviceAdapters/Mightex_C_Cam/Mightex_C_Cam.vcxproj index 4c779091b..626e76b92 100644 --- a/DeviceAdapters/Mightex_C_Cam/Mightex_C_Cam.vcxproj +++ b/DeviceAdapters/Mightex_C_Cam/Mightex_C_Cam.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/DeviceAdapters/Modbus/Modbus.vcxproj b/DeviceAdapters/Modbus/Modbus.vcxproj index 8d71ba351..3548e1c98 100644 --- a/DeviceAdapters/Modbus/Modbus.vcxproj +++ b/DeviceAdapters/Modbus/Modbus.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Motic/MoticCamera.vcxproj b/DeviceAdapters/Motic/MoticCamera.vcxproj index ec6d8c87a..6195ad8ff 100644 --- a/DeviceAdapters/Motic/MoticCamera.vcxproj +++ b/DeviceAdapters/Motic/MoticCamera.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/MoticMicroscope/MoticMicroscope.vcxproj b/DeviceAdapters/MoticMicroscope/MoticMicroscope.vcxproj index 5e1b34bb9..1cfa2dbcc 100644 --- a/DeviceAdapters/MoticMicroscope/MoticMicroscope.vcxproj +++ b/DeviceAdapters/MoticMicroscope/MoticMicroscope.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/NI100X/NI100X.vcxproj b/DeviceAdapters/NI100X/NI100X.vcxproj index 1029f9b95..d649e74f7 100644 --- a/DeviceAdapters/NI100X/NI100X.vcxproj +++ b/DeviceAdapters/NI100X/NI100X.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/NIDAQ/NIDAQ.vcxproj b/DeviceAdapters/NIDAQ/NIDAQ.vcxproj index 587636144..8dbbf87a2 100644 --- a/DeviceAdapters/NIDAQ/NIDAQ.vcxproj +++ b/DeviceAdapters/NIDAQ/NIDAQ.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/NIMultiAnalog/NIMultiAnalog.vcxproj b/DeviceAdapters/NIMultiAnalog/NIMultiAnalog.vcxproj index 2e6d5f48c..d75fd12ba 100644 --- a/DeviceAdapters/NIMultiAnalog/NIMultiAnalog.vcxproj +++ b/DeviceAdapters/NIMultiAnalog/NIMultiAnalog.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/NKTSuperK/NKTSuperK.vcxproj b/DeviceAdapters/NKTSuperK/NKTSuperK.vcxproj index 9f037cd74..83016b815 100644 --- a/DeviceAdapters/NKTSuperK/NKTSuperK.vcxproj +++ b/DeviceAdapters/NKTSuperK/NKTSuperK.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/DeviceAdapters/Neos/Neos.vcxproj b/DeviceAdapters/Neos/Neos.vcxproj index dd81d71f2..3f434d5ca 100644 --- a/DeviceAdapters/Neos/Neos.vcxproj +++ b/DeviceAdapters/Neos/Neos.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/NewportCONEX/NewportCONEX.vcxproj b/DeviceAdapters/NewportCONEX/NewportCONEX.vcxproj index ea48364a7..897e3b968 100644 --- a/DeviceAdapters/NewportCONEX/NewportCONEX.vcxproj +++ b/DeviceAdapters/NewportCONEX/NewportCONEX.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte - v142 + v143 DynamicLibrary MultiByte - v142 + v143 diff --git a/DeviceAdapters/NewportSMC/NewportSMC.vcxproj b/DeviceAdapters/NewportSMC/NewportSMC.vcxproj index 66e5e0f54..93eb74427 100644 --- a/DeviceAdapters/NewportSMC/NewportSMC.vcxproj +++ b/DeviceAdapters/NewportSMC/NewportSMC.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Nikon/Nikon.vcxproj b/DeviceAdapters/Nikon/Nikon.vcxproj index c2707f621..56fb737f3 100644 --- a/DeviceAdapters/Nikon/Nikon.vcxproj +++ b/DeviceAdapters/Nikon/Nikon.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/NikonTE2000/NikonTE2000.vcxproj b/DeviceAdapters/NikonTE2000/NikonTE2000.vcxproj index 2a5ab7212..b71882b3c 100644 --- a/DeviceAdapters/NikonTE2000/NikonTE2000.vcxproj +++ b/DeviceAdapters/NikonTE2000/NikonTE2000.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/NotificationTester/NotificationTester.vcxproj b/DeviceAdapters/NotificationTester/NotificationTester.vcxproj index 56a5b3dfc..60218fdd5 100644 --- a/DeviceAdapters/NotificationTester/NotificationTester.vcxproj +++ b/DeviceAdapters/NotificationTester/NotificationTester.vcxproj @@ -33,13 +33,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/OVP_ECS2/OVP_ECS2.vcxproj b/DeviceAdapters/OVP_ECS2/OVP_ECS2.vcxproj index 5817996fa..0c6432cfb 100644 --- a/DeviceAdapters/OVP_ECS2/OVP_ECS2.vcxproj +++ b/DeviceAdapters/OVP_ECS2/OVP_ECS2.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ObjectiveImaging/ObjectiveImaging.vcxproj b/DeviceAdapters/ObjectiveImaging/ObjectiveImaging.vcxproj index d871fbf04..f5e1a30a7 100644 --- a/DeviceAdapters/ObjectiveImaging/ObjectiveImaging.vcxproj +++ b/DeviceAdapters/ObjectiveImaging/ObjectiveImaging.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary Unicode - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/Okolab/Okolab.vcxproj b/DeviceAdapters/Okolab/Okolab.vcxproj index 1b0361b4a..3dc6c36aa 100644 --- a/DeviceAdapters/Okolab/Okolab.vcxproj +++ b/DeviceAdapters/Okolab/Okolab.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary true Unicode - v142 + v143 diff --git a/DeviceAdapters/Omicron/Omicron.vcxproj b/DeviceAdapters/Omicron/Omicron.vcxproj index cf0b93787..b2570f5fc 100644 --- a/DeviceAdapters/Omicron/Omicron.vcxproj +++ b/DeviceAdapters/Omicron/Omicron.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.vcxproj b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.vcxproj index fe45fe03f..394c5b5a9 100644 --- a/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.vcxproj +++ b/DeviceAdapters/OpenCVgrabber/OpenCVgrabber.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary NotSet true - v142 + v143 false DynamicLibrary NotSet - v142 + v143 true diff --git a/DeviceAdapters/Oxxius/Oxxius.vcxproj b/DeviceAdapters/Oxxius/Oxxius.vcxproj index 42bb6e1be..b888e78e3 100644 --- a/DeviceAdapters/Oxxius/Oxxius.vcxproj +++ b/DeviceAdapters/Oxxius/Oxxius.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/OxxiusCombiner/OxxiusCombiner.vcxproj b/DeviceAdapters/OxxiusCombiner/OxxiusCombiner.vcxproj index 16a36d06e..b3111bca7 100644 --- a/DeviceAdapters/OxxiusCombiner/OxxiusCombiner.vcxproj +++ b/DeviceAdapters/OxxiusCombiner/OxxiusCombiner.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PCO_Generic/PCO_Camera.vcxproj b/DeviceAdapters/PCO_Generic/PCO_Camera.vcxproj index 88a88e36b..81361d9f1 100644 --- a/DeviceAdapters/PCO_Generic/PCO_Camera.vcxproj +++ b/DeviceAdapters/PCO_Generic/PCO_Camera.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PI/PI.vcxproj b/DeviceAdapters/PI/PI.vcxproj index 8b8ee970b..56964287b 100644 --- a/DeviceAdapters/PI/PI.vcxproj +++ b/DeviceAdapters/PI/PI.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PICAM/PICAM.vcxproj b/DeviceAdapters/PICAM/PICAM.vcxproj index b6e8592a0..599ad7b71 100644 --- a/DeviceAdapters/PICAM/PICAM.vcxproj +++ b/DeviceAdapters/PICAM/PICAM.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PIEZOCONCEPT/PIEZOCONCEPT.vcxproj b/DeviceAdapters/PIEZOCONCEPT/PIEZOCONCEPT.vcxproj index 63d3e2653..9f41d1f0b 100644 --- a/DeviceAdapters/PIEZOCONCEPT/PIEZOCONCEPT.vcxproj +++ b/DeviceAdapters/PIEZOCONCEPT/PIEZOCONCEPT.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/PI_GCS/PI_GCS.vcxproj b/DeviceAdapters/PI_GCS/PI_GCS.vcxproj index 105bb7da1..3a1d6b893 100644 --- a/DeviceAdapters/PI_GCS/PI_GCS.vcxproj +++ b/DeviceAdapters/PI_GCS/PI_GCS.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj b/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj index da62c13af..d627f3a42 100644 --- a/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj +++ b/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj.filters b/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj.filters index a70291a09..359f88259 100644 --- a/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj.filters +++ b/DeviceAdapters/PI_GCS_2/PI_GCS_2.vcxproj.filters @@ -64,5 +64,8 @@ Header Files + + Header Files + \ No newline at end of file diff --git a/DeviceAdapters/PVCAM/PVCAM.vcxproj b/DeviceAdapters/PVCAM/PVCAM.vcxproj index 7641d2817..87cdf848d 100644 --- a/DeviceAdapters/PVCAM/PVCAM.vcxproj +++ b/DeviceAdapters/PVCAM/PVCAM.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ParallelPort/ParallelPort.vcxproj b/DeviceAdapters/ParallelPort/ParallelPort.vcxproj index fad743c48..1d9ee12b2 100644 --- a/DeviceAdapters/ParallelPort/ParallelPort.vcxproj +++ b/DeviceAdapters/ParallelPort/ParallelPort.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PeCon2000/PeCon2000.vcxproj b/DeviceAdapters/PeCon2000/PeCon2000.vcxproj index e259db56b..34797dd4d 100644 --- a/DeviceAdapters/PeCon2000/PeCon2000.vcxproj +++ b/DeviceAdapters/PeCon2000/PeCon2000.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/DeviceAdapters/Pecon/Pecon.vcxproj b/DeviceAdapters/Pecon/Pecon.vcxproj index 5947142f6..0d5203605 100644 --- a/DeviceAdapters/Pecon/Pecon.vcxproj +++ b/DeviceAdapters/Pecon/Pecon.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PicardStage/PicardStage.vcxproj b/DeviceAdapters/PicardStage/PicardStage.vcxproj index 61ddf8d9f..f58ed1dc0 100644 --- a/DeviceAdapters/PicardStage/PicardStage.vcxproj +++ b/DeviceAdapters/PicardStage/PicardStage.vcxproj @@ -20,12 +20,12 @@ DynamicLibrary MultiByte - v142 + v143 DynamicLibrary MultiByte - v142 + v143 diff --git a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.vcxproj b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.vcxproj index 823098b0a..ed3b6e6a8 100644 --- a/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.vcxproj +++ b/DeviceAdapters/Piezosystem_30DV50/Piezosystem_30DV50.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.vcxproj b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.vcxproj index f32c4a29d..2b4ebb59a 100644 --- a/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.vcxproj +++ b/DeviceAdapters/Piezosystem_NV120_1/Piezosystem_NV120_1.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.vcxproj b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.vcxproj index c61bea520..7bfdd0df9 100644 --- a/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.vcxproj +++ b/DeviceAdapters/Piezosystem_NV40_1/Piezosystem_NV40_1.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.vcxproj b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.vcxproj index b6fce56d0..da15a7007 100644 --- a/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.vcxproj +++ b/DeviceAdapters/Piezosystem_NV40_3/Piezosystem_NV40_3.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.vcxproj b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.vcxproj index 2b9c5d776..8fde0819d 100644 --- a/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.vcxproj +++ b/DeviceAdapters/Piezosystem_dDrive/Piezosystem_dDrive.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Piper/Piper.vcxproj b/DeviceAdapters/Piper/Piper.vcxproj index 000c16374..db1bc34b9 100644 --- a/DeviceAdapters/Piper/Piper.vcxproj +++ b/DeviceAdapters/Piper/Piper.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Pixelink/Pixelink.vcxproj b/DeviceAdapters/Pixelink/Pixelink.vcxproj index 163c7d3e1..7fd9c90fc 100644 --- a/DeviceAdapters/Pixelink/Pixelink.vcxproj +++ b/DeviceAdapters/Pixelink/Pixelink.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PointGrey/PointGrey.vcxproj b/DeviceAdapters/PointGrey/PointGrey.vcxproj index fecc2f1f0..5faee892a 100644 --- a/DeviceAdapters/PointGrey/PointGrey.vcxproj +++ b/DeviceAdapters/PointGrey/PointGrey.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PrecisExcite/PrecisExcite.vcxproj b/DeviceAdapters/PrecisExcite/PrecisExcite.vcxproj index 643e6dc3f..0abba583f 100644 --- a/DeviceAdapters/PrecisExcite/PrecisExcite.vcxproj +++ b/DeviceAdapters/PrecisExcite/PrecisExcite.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Prior/Prior.vcxproj b/DeviceAdapters/Prior/Prior.vcxproj index e351b357d..f2679eb97 100644 --- a/DeviceAdapters/Prior/Prior.vcxproj +++ b/DeviceAdapters/Prior/Prior.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PriorLegacy/PriorLegacy.vcxproj b/DeviceAdapters/PriorLegacy/PriorLegacy.vcxproj index eaade2c19..ad5c73372 100644 --- a/DeviceAdapters/PriorLegacy/PriorLegacy.vcxproj +++ b/DeviceAdapters/PriorLegacy/PriorLegacy.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/PrizmatixDevice/PrizmatixDevice.vcxproj b/DeviceAdapters/PrizmatixDevice/PrizmatixDevice.vcxproj index 11c77052f..7ecd83c11 100644 --- a/DeviceAdapters/PrizmatixDevice/PrizmatixDevice.vcxproj +++ b/DeviceAdapters/PrizmatixDevice/PrizmatixDevice.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/QCam/QCam.vcxproj b/DeviceAdapters/QCam/QCam.vcxproj index 3953ddae1..9ee86baed 100644 --- a/DeviceAdapters/QCam/QCam.vcxproj +++ b/DeviceAdapters/QCam/QCam.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/QSI/QSI.vcxproj b/DeviceAdapters/QSI/QSI.vcxproj index a70bba956..0e0892992 100644 --- a/DeviceAdapters/QSI/QSI.vcxproj +++ b/DeviceAdapters/QSI/QSI.vcxproj @@ -34,13 +34,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode @@ -109,4 +109,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/Rapp/Rapp.vcxproj b/DeviceAdapters/Rapp/Rapp.vcxproj index 553eacc49..59a69de92 100644 --- a/DeviceAdapters/Rapp/Rapp.vcxproj +++ b/DeviceAdapters/Rapp/Rapp.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true @@ -106,4 +106,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/RaptorEPIX/HoribaEPIX.vcxproj b/DeviceAdapters/RaptorEPIX/HoribaEPIX.vcxproj index 4ad975482..ab6423ae9 100644 --- a/DeviceAdapters/RaptorEPIX/HoribaEPIX.vcxproj +++ b/DeviceAdapters/RaptorEPIX/HoribaEPIX.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/RaptorEPIX/RaptorEPIX.vcxproj b/DeviceAdapters/RaptorEPIX/RaptorEPIX.vcxproj index be45906b0..0dfa4b6ad 100644 --- a/DeviceAdapters/RaptorEPIX/RaptorEPIX.vcxproj +++ b/DeviceAdapters/RaptorEPIX/RaptorEPIX.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Sapphire/Sapphire.vcxproj b/DeviceAdapters/Sapphire/Sapphire.vcxproj index 74abbaf9f..7a3700b2a 100644 --- a/DeviceAdapters/Sapphire/Sapphire.vcxproj +++ b/DeviceAdapters/Sapphire/Sapphire.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Scientifica/Scientifica.vcxproj b/DeviceAdapters/Scientifica/Scientifica.vcxproj index 92a90ecdd..36195e32a 100644 --- a/DeviceAdapters/Scientifica/Scientifica.vcxproj +++ b/DeviceAdapters/Scientifica/Scientifica.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ScopeLED/ScopeLED.vcxproj b/DeviceAdapters/ScopeLED/ScopeLED.vcxproj index 751a35590..896c3e645 100644 --- a/DeviceAdapters/ScopeLED/ScopeLED.vcxproj +++ b/DeviceAdapters/ScopeLED/ScopeLED.vcxproj @@ -19,12 +19,12 @@ DynamicLibrary - v142 + v143 false DynamicLibrary - v142 + v143 true diff --git a/DeviceAdapters/SequenceTester/SequenceTester.vcxproj b/DeviceAdapters/SequenceTester/SequenceTester.vcxproj index 5b63e7852..b11b54315 100644 --- a/DeviceAdapters/SequenceTester/SequenceTester.vcxproj +++ b/DeviceAdapters/SequenceTester/SequenceTester.vcxproj @@ -43,13 +43,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/SerialManager/SerialManager.vcxproj b/DeviceAdapters/SerialManager/SerialManager.vcxproj index 8a40c4b94..15f17ad82 100644 --- a/DeviceAdapters/SerialManager/SerialManager.vcxproj +++ b/DeviceAdapters/SerialManager/SerialManager.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/SigmaKoki/SigmaKoki.vcxproj b/DeviceAdapters/SigmaKoki/SigmaKoki.vcxproj index 7e042b67b..b278ecd50 100644 --- a/DeviceAdapters/SigmaKoki/SigmaKoki.vcxproj +++ b/DeviceAdapters/SigmaKoki/SigmaKoki.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/Skyra/Skyra.vcxproj b/DeviceAdapters/Skyra/Skyra.vcxproj index 231b6a4a3..2fc8bdbde 100644 --- a/DeviceAdapters/Skyra/Skyra.vcxproj +++ b/DeviceAdapters/Skyra/Skyra.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary NotSet - v142 + v143 false DynamicLibrary NotSet - v142 + v143 true diff --git a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.vcxproj b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.vcxproj index 6082aa82c..5523e54f1 100644 --- a/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.vcxproj +++ b/DeviceAdapters/SmarActHCU-3D/SmarActHCU-3D.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/SouthPort/SouthPort.vcxproj b/DeviceAdapters/SouthPort/SouthPort.vcxproj index 4a165d9b4..06cf7cbcb 100644 --- a/DeviceAdapters/SouthPort/SouthPort.vcxproj +++ b/DeviceAdapters/SouthPort/SouthPort.vcxproj @@ -19,13 +19,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/DeviceAdapters/SpectralLMM5/SpectralLMM5.vcxproj b/DeviceAdapters/SpectralLMM5/SpectralLMM5.vcxproj index b74dec662..4888d3227 100644 --- a/DeviceAdapters/SpectralLMM5/SpectralLMM5.vcxproj +++ b/DeviceAdapters/SpectralLMM5/SpectralLMM5.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary NotSet true - v142 + v143 false DynamicLibrary NotSet - v142 + v143 true diff --git a/DeviceAdapters/Spinnaker/SpinnakerCamera.vcxproj b/DeviceAdapters/Spinnaker/SpinnakerCamera.vcxproj index 53197c8e3..6adc11e90 100644 --- a/DeviceAdapters/Spinnaker/SpinnakerCamera.vcxproj +++ b/DeviceAdapters/Spinnaker/SpinnakerCamera.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/Standa/Standa.vcxproj b/DeviceAdapters/Standa/Standa.vcxproj index bdf0e090d..8ac1442d0 100644 --- a/DeviceAdapters/Standa/Standa.vcxproj +++ b/DeviceAdapters/Standa/Standa.vcxproj @@ -22,14 +22,14 @@ Unicode false true - v142 + v143 false DynamicLibrary Unicode false - v142 + v143 true diff --git a/DeviceAdapters/Standa8SMC4/Standa8SMC4.vcxproj b/DeviceAdapters/Standa8SMC4/Standa8SMC4.vcxproj index 5b8c556cf..b6eb68981 100644 --- a/DeviceAdapters/Standa8SMC4/Standa8SMC4.vcxproj +++ b/DeviceAdapters/Standa8SMC4/Standa8SMC4.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/StandaStage/StandaStage.vcxproj b/DeviceAdapters/StandaStage/StandaStage.vcxproj index ebb29f7ad..42a613e3f 100644 --- a/DeviceAdapters/StandaStage/StandaStage.vcxproj +++ b/DeviceAdapters/StandaStage/StandaStage.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/StarlightXpress/StarlightXpress.vcxproj b/DeviceAdapters/StarlightXpress/StarlightXpress.vcxproj index f10db1205..683bedc52 100644 --- a/DeviceAdapters/StarlightXpress/StarlightXpress.vcxproj +++ b/DeviceAdapters/StarlightXpress/StarlightXpress.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/SutterLambda/SutterLambda.vcxproj b/DeviceAdapters/SutterLambda/SutterLambda.vcxproj index a9331534a..e7bf06df3 100644 --- a/DeviceAdapters/SutterLambda/SutterLambda.vcxproj +++ b/DeviceAdapters/SutterLambda/SutterLambda.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true @@ -104,4 +104,4 @@ - + \ No newline at end of file diff --git a/DeviceAdapters/SutterLambda2/SutterLambda2.vcxproj b/DeviceAdapters/SutterLambda2/SutterLambda2.vcxproj index 4a2fe06bd..3bb1b2491 100644 --- a/DeviceAdapters/SutterLambda2/SutterLambda2.vcxproj +++ b/DeviceAdapters/SutterLambda2/SutterLambda2.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/SutterLambdaParallelArduino/SutterLambdaParallelArduino.vcxproj b/DeviceAdapters/SutterLambdaParallelArduino/SutterLambdaParallelArduino.vcxproj index 3e3a7b4de..efd6ffe49 100644 --- a/DeviceAdapters/SutterLambdaParallelArduino/SutterLambdaParallelArduino.vcxproj +++ b/DeviceAdapters/SutterLambdaParallelArduino/SutterLambdaParallelArduino.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/SutterStage/SutterStage.vcxproj b/DeviceAdapters/SutterStage/SutterStage.vcxproj index 8e1b40bbc..e5125c569 100644 --- a/DeviceAdapters/SutterStage/SutterStage.vcxproj +++ b/DeviceAdapters/SutterStage/SutterStage.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/TCPIPPort/TCPIPPort.vcxproj b/DeviceAdapters/TCPIPPort/TCPIPPort.vcxproj index 7125c6c0c..c15698eae 100644 --- a/DeviceAdapters/TCPIPPort/TCPIPPort.vcxproj +++ b/DeviceAdapters/TCPIPPort/TCPIPPort.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/TISCam/TIScam.vcxproj b/DeviceAdapters/TISCam/TIScam.vcxproj index 2f4fb6705..b67ae8b19 100644 --- a/DeviceAdapters/TISCam/TIScam.vcxproj +++ b/DeviceAdapters/TISCam/TIScam.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/TSI/TSI.vcxproj b/DeviceAdapters/TSI/TSI.vcxproj index 21c4d8f67..fdaec15a2 100644 --- a/DeviceAdapters/TSI/TSI.vcxproj +++ b/DeviceAdapters/TSI/TSI.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/TUCam/MMTUCam.vcxproj b/DeviceAdapters/TUCam/MMTUCam.vcxproj index 1c8845a52..17eb0adf7 100644 --- a/DeviceAdapters/TUCam/MMTUCam.vcxproj +++ b/DeviceAdapters/TUCam/MMTUCam.vcxproj @@ -21,12 +21,12 @@ DynamicLibrary MultiByte - v142 + v143 DynamicLibrary MultiByte - v142 + v143 diff --git a/DeviceAdapters/TeesnySLM/TeensySLM.vcxproj b/DeviceAdapters/TeesnySLM/TeensySLM.vcxproj index a928f21b5..e6b909cc4 100644 --- a/DeviceAdapters/TeesnySLM/TeensySLM.vcxproj +++ b/DeviceAdapters/TeesnySLM/TeensySLM.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Thorlabs/Thorlabs.vcxproj b/DeviceAdapters/Thorlabs/Thorlabs.vcxproj index fa58362d9..7e2cfbef6 100644 --- a/DeviceAdapters/Thorlabs/Thorlabs.vcxproj +++ b/DeviceAdapters/Thorlabs/Thorlabs.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.vcxproj b/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.vcxproj index 9fba9c6b8..44309b9a1 100644 --- a/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.vcxproj +++ b/DeviceAdapters/ThorlabsAPTStage/ThorlabsAPTStage.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsCHROLIS/ThorlabsCHROLIS.vcxproj b/DeviceAdapters/ThorlabsCHROLIS/ThorlabsCHROLIS.vcxproj index 4b12160c8..9fbcbf4f3 100644 --- a/DeviceAdapters/ThorlabsCHROLIS/ThorlabsCHROLIS.vcxproj +++ b/DeviceAdapters/ThorlabsCHROLIS/ThorlabsCHROLIS.vcxproj @@ -33,13 +33,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/ThorlabsDCxxxx/ThorlabsDCxxxx.vcxproj b/DeviceAdapters/ThorlabsDCxxxx/ThorlabsDCxxxx.vcxproj index d9b46f8c2..7d6363dab 100644 --- a/DeviceAdapters/ThorlabsDCxxxx/ThorlabsDCxxxx.vcxproj +++ b/DeviceAdapters/ThorlabsDCxxxx/ThorlabsDCxxxx.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.vcxproj b/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.vcxproj index 18a3d60df..132b1b02b 100644 --- a/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.vcxproj +++ b/DeviceAdapters/ThorlabsElliptecSlider/ThorlabsElliptecSlider.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsFilterWheel/ThorlabsFilterWheel.vcxproj b/DeviceAdapters/ThorlabsFilterWheel/ThorlabsFilterWheel.vcxproj index 457789049..9c875eb52 100644 --- a/DeviceAdapters/ThorlabsFilterWheel/ThorlabsFilterWheel.vcxproj +++ b/DeviceAdapters/ThorlabsFilterWheel/ThorlabsFilterWheel.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsPM100x/ThorlabsPM100x.vcxproj b/DeviceAdapters/ThorlabsPM100x/ThorlabsPM100x.vcxproj index c4478ee06..88edcff14 100644 --- a/DeviceAdapters/ThorlabsPM100x/ThorlabsPM100x.vcxproj +++ b/DeviceAdapters/ThorlabsPM100x/ThorlabsPM100x.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsSC10/ThorlabsSC10.vcxproj b/DeviceAdapters/ThorlabsSC10/ThorlabsSC10.vcxproj index a8cf4c0bb..6e5e86f42 100644 --- a/DeviceAdapters/ThorlabsSC10/ThorlabsSC10.vcxproj +++ b/DeviceAdapters/ThorlabsSC10/ThorlabsSC10.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.vcxproj b/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.vcxproj index 8354a8d6d..310fb7313 100644 --- a/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.vcxproj +++ b/DeviceAdapters/ThorlabsUSBCamera/ThorlabsUSBCamera.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Thorlabs_ELL14/Thorlabs_ELL14.vcxproj b/DeviceAdapters/Thorlabs_ELL14/Thorlabs_ELL14.vcxproj index e12776bce..d403589c2 100644 --- a/DeviceAdapters/Thorlabs_ELL14/Thorlabs_ELL14.vcxproj +++ b/DeviceAdapters/Thorlabs_ELL14/Thorlabs_ELL14.vcxproj @@ -32,13 +32,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/Tofra/Tofra.vcxproj b/DeviceAdapters/Tofra/Tofra.vcxproj index d609e9d55..80157771b 100644 --- a/DeviceAdapters/Tofra/Tofra.vcxproj +++ b/DeviceAdapters/Tofra/Tofra.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.vcxproj b/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.vcxproj index 5306fe1b6..1c4a9b706 100644 --- a/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.vcxproj +++ b/DeviceAdapters/Toptica_iBeamSmartCW/Toptica_iBeamSmartCW.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/TriggerScope/TriggerScope.vcxproj b/DeviceAdapters/TriggerScope/TriggerScope.vcxproj index 4f3fb7777..58c62ea6a 100644 --- a/DeviceAdapters/TriggerScope/TriggerScope.vcxproj +++ b/DeviceAdapters/TriggerScope/TriggerScope.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.vcxproj b/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.vcxproj index 32d5e0ed5..6e76aeb67 100644 --- a/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.vcxproj +++ b/DeviceAdapters/TriggerScopeMM/TriggerScopeMM.vcxproj @@ -22,14 +22,14 @@ DynamicLibrary true MultiByte - v142 + v143 DynamicLibrary false true MultiByte - v142 + v143 diff --git a/DeviceAdapters/TwainCamera/TwainCamera.vcxproj b/DeviceAdapters/TwainCamera/TwainCamera.vcxproj index 7119c5f55..9108864a1 100644 --- a/DeviceAdapters/TwainCamera/TwainCamera.vcxproj +++ b/DeviceAdapters/TwainCamera/TwainCamera.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary NotSet true - v142 + v143 false DynamicLibrary NotSet - v142 + v143 true diff --git a/DeviceAdapters/TwoPhoton/TwoPhoton.vcxproj b/DeviceAdapters/TwoPhoton/TwoPhoton.vcxproj index 01a503b12..68c0838da 100644 --- a/DeviceAdapters/TwoPhoton/TwoPhoton.vcxproj +++ b/DeviceAdapters/TwoPhoton/TwoPhoton.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/USBManager/USBManager.vcxproj b/DeviceAdapters/USBManager/USBManager.vcxproj index 678ce0061..cb0b69d7a 100644 --- a/DeviceAdapters/USBManager/USBManager.vcxproj +++ b/DeviceAdapters/USBManager/USBManager.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/USB_Viper_QPL/USB_Viper_QPL.vcxproj b/DeviceAdapters/USB_Viper_QPL/USB_Viper_QPL.vcxproj index f406a7bc3..a6f059b71 100644 --- a/DeviceAdapters/USB_Viper_QPL/USB_Viper_QPL.vcxproj +++ b/DeviceAdapters/USB_Viper_QPL/USB_Viper_QPL.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/UniversalMMHubSerial/UniversalMMHubSerial.vcxproj b/DeviceAdapters/UniversalMMHubSerial/UniversalMMHubSerial.vcxproj index 03b05e887..3ca93b194 100644 --- a/DeviceAdapters/UniversalMMHubSerial/UniversalMMHubSerial.vcxproj +++ b/DeviceAdapters/UniversalMMHubSerial/UniversalMMHubSerial.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/UniversalMMHubUsb/UniversalMMHubUsb.vcxproj b/DeviceAdapters/UniversalMMHubUsb/UniversalMMHubUsb.vcxproj index 635ca62d8..fa935c51f 100644 --- a/DeviceAdapters/UniversalMMHubUsb/UniversalMMHubUsb.vcxproj +++ b/DeviceAdapters/UniversalMMHubUsb/UniversalMMHubUsb.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/UserDefinedSerial/UserDefinedSerial.vcxproj b/DeviceAdapters/UserDefinedSerial/UserDefinedSerial.vcxproj index d949056c7..e92315787 100644 --- a/DeviceAdapters/UserDefinedSerial/UserDefinedSerial.vcxproj +++ b/DeviceAdapters/UserDefinedSerial/UserDefinedSerial.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Utilities/Utilities.vcxproj b/DeviceAdapters/Utilities/Utilities.vcxproj index 540094967..3011ea924 100644 --- a/DeviceAdapters/Utilities/Utilities.vcxproj +++ b/DeviceAdapters/Utilities/Utilities.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Utilities/Utilities.vcxproj.filters b/DeviceAdapters/Utilities/Utilities.vcxproj.filters index 6fb30c3d1..3d0647137 100644 --- a/DeviceAdapters/Utilities/Utilities.vcxproj.filters +++ b/DeviceAdapters/Utilities/Utilities.vcxproj.filters @@ -18,6 +18,51 @@ Source Files + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + diff --git a/DeviceAdapters/VariLC/VariLC.vcxproj b/DeviceAdapters/VariLC/VariLC.vcxproj index f61885955..2e1953b89 100644 --- a/DeviceAdapters/VariLC/VariLC.vcxproj +++ b/DeviceAdapters/VariLC/VariLC.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/VarispecLCTF/VarispecLCTF.vcxproj b/DeviceAdapters/VarispecLCTF/VarispecLCTF.vcxproj index ed0084cc2..441a95622 100644 --- a/DeviceAdapters/VarispecLCTF/VarispecLCTF.vcxproj +++ b/DeviceAdapters/VarispecLCTF/VarispecLCTF.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Vincent/Vincent.vcxproj b/DeviceAdapters/Vincent/Vincent.vcxproj index f80b9e2b2..4b5604669 100644 --- a/DeviceAdapters/Vincent/Vincent.vcxproj +++ b/DeviceAdapters/Vincent/Vincent.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/VisiTech_iSIM/VisiTech_iSIM.vcxproj b/DeviceAdapters/VisiTech_iSIM/VisiTech_iSIM.vcxproj index 6a6782ad3..c59254b68 100644 --- a/DeviceAdapters/VisiTech_iSIM/VisiTech_iSIM.vcxproj +++ b/DeviceAdapters/VisiTech_iSIM/VisiTech_iSIM.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/Vortran/Stradus.vcxproj b/DeviceAdapters/Vortran/Stradus.vcxproj index 2cc9ca196..12ae709d8 100644 --- a/DeviceAdapters/Vortran/Stradus.vcxproj +++ b/DeviceAdapters/Vortran/Stradus.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Vortran/VersaLase.vcxproj b/DeviceAdapters/Vortran/VersaLase.vcxproj index 70bc6daa8..e52c7e9f0 100644 --- a/DeviceAdapters/Vortran/VersaLase.vcxproj +++ b/DeviceAdapters/Vortran/VersaLase.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/WOSM/WOSM.vcxproj b/DeviceAdapters/WOSM/WOSM.vcxproj index 937832a2f..cb85a8312 100644 --- a/DeviceAdapters/WOSM/WOSM.vcxproj +++ b/DeviceAdapters/WOSM/WOSM.vcxproj @@ -32,13 +32,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/WieneckeSinske/WieneckeSinske.vcxproj b/DeviceAdapters/WieneckeSinske/WieneckeSinske.vcxproj index 66e0adc6f..b5375fc66 100644 --- a/DeviceAdapters/WieneckeSinske/WieneckeSinske.vcxproj +++ b/DeviceAdapters/WieneckeSinske/WieneckeSinske.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/XCite120PC_Exacte/XCite120PC_Exacte.vcxproj b/DeviceAdapters/XCite120PC_Exacte/XCite120PC_Exacte.vcxproj index 8b5e72ace..177b61fb7 100644 --- a/DeviceAdapters/XCite120PC_Exacte/XCite120PC_Exacte.vcxproj +++ b/DeviceAdapters/XCite120PC_Exacte/XCite120PC_Exacte.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/XCiteLed/XCiteLed.vcxproj b/DeviceAdapters/XCiteLed/XCiteLed.vcxproj index 6a1802dab..5f4a6a427 100644 --- a/DeviceAdapters/XCiteLed/XCiteLed.vcxproj +++ b/DeviceAdapters/XCiteLed/XCiteLed.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/XCiteXT600/XCiteXT600.vcxproj b/DeviceAdapters/XCiteXT600/XCiteXT600.vcxproj index eb0888020..6406d9962 100644 --- a/DeviceAdapters/XCiteXT600/XCiteXT600.vcxproj +++ b/DeviceAdapters/XCiteXT600/XCiteXT600.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/XLight/XLight.vcxproj b/DeviceAdapters/XLight/XLight.vcxproj index b3927c52b..af4ce1095 100644 --- a/DeviceAdapters/XLight/XLight.vcxproj +++ b/DeviceAdapters/XLight/XLight.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/DeviceAdapters/XLightV3/XLightV3.vcxproj b/DeviceAdapters/XLightV3/XLightV3.vcxproj index a1f7106cc..de7d060c4 100644 --- a/DeviceAdapters/XLightV3/XLightV3.vcxproj +++ b/DeviceAdapters/XLightV3/XLightV3.vcxproj @@ -33,13 +33,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/Xcite/Xcite.vcxproj b/DeviceAdapters/Xcite/Xcite.vcxproj index cf2031876..519ac4ac0 100644 --- a/DeviceAdapters/Xcite/Xcite.vcxproj +++ b/DeviceAdapters/Xcite/Xcite.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Ximea/XIMEACamera.vcxproj b/DeviceAdapters/Ximea/XIMEACamera.vcxproj index 36ce12437..8bc4fd6b4 100644 --- a/DeviceAdapters/Ximea/XIMEACamera.vcxproj +++ b/DeviceAdapters/Ximea/XIMEACamera.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/YodnE600/YodnE600.vcxproj b/DeviceAdapters/YodnE600/YodnE600.vcxproj index 53cea4bad..a248cb347 100644 --- a/DeviceAdapters/YodnE600/YodnE600.vcxproj +++ b/DeviceAdapters/YodnE600/YodnE600.vcxproj @@ -19,13 +19,13 @@ DynamicLibrary true - v142 + v143 MultiByte DynamicLibrary false - v142 + v143 true MultiByte diff --git a/DeviceAdapters/Yokogawa/CSUX/CSUX.vcxproj b/DeviceAdapters/Yokogawa/CSUX/CSUX.vcxproj index fc6db5e7d..6482945a9 100644 --- a/DeviceAdapters/Yokogawa/CSUX/CSUX.vcxproj +++ b/DeviceAdapters/Yokogawa/CSUX/CSUX.vcxproj @@ -19,13 +19,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/Yokogawa/Yokogawa.vcxproj b/DeviceAdapters/Yokogawa/Yokogawa.vcxproj index 5e1a54ccf..c10137473 100644 --- a/DeviceAdapters/Yokogawa/Yokogawa.vcxproj +++ b/DeviceAdapters/Yokogawa/Yokogawa.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ZWO/ZWO.vcxproj b/DeviceAdapters/ZWO/ZWO.vcxproj index 3d065a5b2..996cd7375 100644 --- a/DeviceAdapters/ZWO/ZWO.vcxproj +++ b/DeviceAdapters/ZWO/ZWO.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary true - v142 + v143 Unicode DynamicLibrary false - v142 + v143 true Unicode diff --git a/DeviceAdapters/Zaber/Zaber.vcxproj b/DeviceAdapters/Zaber/Zaber.vcxproj index a25dd995a..251b553f1 100644 --- a/DeviceAdapters/Zaber/Zaber.vcxproj +++ b/DeviceAdapters/Zaber/Zaber.vcxproj @@ -20,7 +20,7 @@ DynamicLibrary true Unicode - v142 + v143 false @@ -28,7 +28,7 @@ false false Unicode - v142 + v143 diff --git a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.vcxproj b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.vcxproj index 8ab4df04f..0315fad27 100644 --- a/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.vcxproj +++ b/DeviceAdapters/ZeissAxioZoom/ZeissAxioZoom.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/ZeissCAN/ZeissCAN.vcxproj b/DeviceAdapters/ZeissCAN/ZeissCAN.vcxproj index 555fd62a4..7eb236fa0 100644 --- a/DeviceAdapters/ZeissCAN/ZeissCAN.vcxproj +++ b/DeviceAdapters/ZeissCAN/ZeissCAN.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary Unicode true - v142 + v143 false DynamicLibrary Unicode - v142 + v143 true diff --git a/DeviceAdapters/ZeissCAN29/ZeissCAN29.vcxproj b/DeviceAdapters/ZeissCAN29/ZeissCAN29.vcxproj index ffc8f437e..dcb0c75b4 100644 --- a/DeviceAdapters/ZeissCAN29/ZeissCAN29.vcxproj +++ b/DeviceAdapters/ZeissCAN29/ZeissCAN29.vcxproj @@ -21,13 +21,13 @@ DynamicLibrary MultiByte true - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/dc1394/dc1394.vcxproj b/DeviceAdapters/dc1394/dc1394.vcxproj index 6d3b61fc4..83d4403a1 100644 --- a/DeviceAdapters/dc1394/dc1394.vcxproj +++ b/DeviceAdapters/dc1394/dc1394.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/kdv/KDV.vcxproj b/DeviceAdapters/kdv/KDV.vcxproj index c446512f0..f2521d0ca 100644 --- a/DeviceAdapters/kdv/KDV.vcxproj +++ b/DeviceAdapters/kdv/KDV.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/nPoint/NPointC400.vcxproj b/DeviceAdapters/nPoint/NPointC400.vcxproj index 884cfedcf..97aab0445 100644 --- a/DeviceAdapters/nPoint/NPointC400.vcxproj +++ b/DeviceAdapters/nPoint/NPointC400.vcxproj @@ -22,13 +22,13 @@ DynamicLibrary MultiByte false - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true diff --git a/DeviceAdapters/pgFocus/pgFocus.vcxproj b/DeviceAdapters/pgFocus/pgFocus.vcxproj index d089b111b..252d40ae1 100644 --- a/DeviceAdapters/pgFocus/pgFocus.vcxproj +++ b/DeviceAdapters/pgFocus/pgFocus.vcxproj @@ -21,14 +21,14 @@ DynamicLibrary true Unicode - v142 + v143 DynamicLibrary false true Unicode - v142 + v143 diff --git a/MMCore/MMCore.vcxproj b/MMCore/MMCore.vcxproj index ebfdcb9ba..188ad4151 100644 --- a/MMCore/MMCore.vcxproj +++ b/MMCore/MMCore.vcxproj @@ -20,13 +20,13 @@ StaticLibrary MultiByte - v142 + v143 false StaticLibrary MultiByte - v142 + v143 true @@ -181,4 +181,4 @@ - + \ No newline at end of file diff --git a/MMCoreJ_wrap/MMCoreJ_wrap.vcxproj b/MMCoreJ_wrap/MMCoreJ_wrap.vcxproj index 54e1e1902..2b26010e1 100644 --- a/MMCoreJ_wrap/MMCoreJ_wrap.vcxproj +++ b/MMCoreJ_wrap/MMCoreJ_wrap.vcxproj @@ -20,13 +20,13 @@ DynamicLibrary MultiByte - v142 + v143 false DynamicLibrary MultiByte - v142 + v143 true @@ -146,4 +146,4 @@ copy %swig_out_dir%\*.java %java_src_dir%\ > NUL - + \ No newline at end of file diff --git a/MMDevice/MMDevice-SharedRuntime.vcxproj b/MMDevice/MMDevice-SharedRuntime.vcxproj index 8df751203..a755869e2 100644 --- a/MMDevice/MMDevice-SharedRuntime.vcxproj +++ b/MMDevice/MMDevice-SharedRuntime.vcxproj @@ -41,13 +41,13 @@ StaticLibrary true MultiByte - v142 + v143 StaticLibrary false MultiByte - v142 + v143 @@ -88,4 +88,4 @@ - + \ No newline at end of file diff --git a/MMDevice/MMDevice-StaticRuntime.vcxproj b/MMDevice/MMDevice-StaticRuntime.vcxproj index b1317341a..d3147e09d 100644 --- a/MMDevice/MMDevice-StaticRuntime.vcxproj +++ b/MMDevice/MMDevice-StaticRuntime.vcxproj @@ -41,13 +41,13 @@ StaticLibrary true MultiByte - v142 + v143 StaticLibrary false MultiByte - v142 + v143 @@ -90,4 +90,4 @@ - + \ No newline at end of file diff --git a/micromanagerSD.slnf b/micromanagerSD.slnf new file mode 100644 index 000000000..a0b85618e --- /dev/null +++ b/micromanagerSD.slnf @@ -0,0 +1,12 @@ +{ + "solution": { + "path": "micromanager.sln", + "projects": [ + "DeviceAdapters\\DemoCamera\\DemoCamera.vcxproj", + "MMCoreJ_wrap\\MMCoreJ_wrap.vcxproj", + "MMCore\\MMCore.vcxproj", + "MMDevice\\MMDevice-SharedRuntime.vcxproj", + "MMDevice\\MMDevice-StaticRuntime.vcxproj" + ] + } +} \ No newline at end of file From 23d2bdc3d2f6a4f26dfd3f1c33975cf219e4000d Mon Sep 17 00:00:00 2001 From: namodaj Date: Fri, 29 Mar 2024 12:18:52 -0700 Subject: [PATCH 02/61] StorageDevice introduced - work in progress --- MMDevice/MMDevice.h | 218 +++++++++++++++++++++++++++++++++++ MMDevice/MMDeviceConstants.h | 3 +- 2 files changed, 220 insertions(+), 1 deletion(-) diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index d6a7db5e0..7d5f1ec60 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -1344,4 +1344,222 @@ namespace MM { MM_DEPRECATED(virtual void ClearPostedErrors(void)) = 0; }; + /** + * Storage API + * Dev Notes: + * - all "meta" variables refer to JSON encoded strings + * - we can create multiple datasets in parallel + */ + class Storage : public Device { + public: + Storage() {} + virtual ~Storage() {} + + virtual DeviceType GetType() const { return Type; } + static const DeviceType Type; + + // Storage API + /** + * Create + * Create new dataset in the location path/name. Fails if the path already exists, or if the number of dimensions less than 1. + * The caller should save the "handle" output parameter to refer to this dataset in subsequent code. + */ + virtual int Create(const char* path, const char* name, int numberOfDimensions, const char* meta, char* handle) = 0; + + /** + * Close + * Closes the dataset. After the dataset is closed its handle becomes invalid. + */ + virtual int Close(const char* handle) = 0; + + /** + * Load + * Load an existing dataset. + * Loaded datasets are immutable; any attempt to add images will fail. + * "Loading" the dataset does not mean it resides in program memory, + * it just means we can access its images and metadata. "Lazy" loading + * is a preffered way of implementation. + */ + virtual int Load(const char* path, const char* name, char* handle) = 0; + + /** + * Deletes a dataset with a given handle + */ + virtual int Delete(char* handle) = 0; + + /** + * Returns a list of dataset names located in a given path. + * TODO: exact behavior of this call should be elaborated + */ + virtual int List(const char* path, const char** listOfDatasets) const = 0; + + /** + * Returns the name for each component + */ + virtual int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta) = 0; + + /** + * Returns the number of simultaneous channels that camera is capable of. + * This should be used by devices capable of generating multiple channels of imagedata simultaneously. + * Note: this should not be used by color cameras (use getNumberOfComponents instead). + */ + virtual int unsigned GetNumberOfChannels() const = 0; + /** + * Returns the name for each Channel. + * An implementation of this function is provided in DeviceBase.h. It will return an empty string + */ + virtual int GetChannelName(unsigned channel, char* name) = 0; + /** + * Returns the size in bytes of the image buffer. + * Required by the MM::Camera API. + * For multi-channel cameras, return the size of a single channel + */ + virtual long GetImageBufferSize() const = 0; + /** + * Returns image buffer X-size in pixels. + * Required by the MM::Camera API. + */ + virtual unsigned GetImageWidth() const = 0; + /** + * Returns image buffer Y-size in pixels. + * Required by the MM::Camera API. + */ + virtual unsigned GetImageHeight() const = 0; + /** + * Returns image buffer pixel depth in bytes. + * Required by the MM::Camera API. + */ + virtual unsigned GetImageBytesPerPixel() const = 0; + /** + * Returns the bit depth (dynamic range) of the pixel. + * This does not affect the buffer size, it just gives the client application + * a guideline on how to interpret pixel values. + * Required by the MM::Camera API. + */ + virtual unsigned GetBitDepth() const = 0; + /** + * Returns binnings factor. Used to calculate current pixelsize + * Not appropriately named. Implemented in DeviceBase.h + */ + virtual double GetPixelSizeUm() const = 0; + /** + * Returns the current binning factor. + */ + virtual int GetBinning() const = 0; + /** + * Sets binning factor. + */ + virtual int SetBinning(int binSize) = 0; + /** + * Sets exposure in milliseconds. + */ + virtual void SetExposure(double exp_ms) = 0; + /** + * Returns the current exposure setting in milliseconds. + */ + virtual double GetExposure() const = 0; + /** + * Sets the camera Region Of Interest. + * Required by the MM::Camera API. + * This command will change the dimensions of the image. + * Depending on the hardware capabilities the camera may not be able to configure the + * exact dimensions requested - but should try do as close as possible. + * If the hardware does not have this capability the software should simulate the ROI by + * appropriately cropping each frame. + * @param x - top-left corner coordinate + * @param y - top-left corner coordinate + * @param xSize - width + * @param ySize - height + */ + virtual int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize) = 0; + /** + * Returns the actual dimensions of the current ROI. + */ + virtual int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize) = 0; + /** + * Resets the Region of Interest to full frame. + */ + virtual int ClearROI() = 0; + virtual bool SupportsMultiROI() = 0; + virtual bool IsMultiROISet() = 0; + virtual int GetMultiROICount(unsigned& count) = 0; + virtual int SetMultiROI(const unsigned* xs, const unsigned* ys, + const unsigned* widths, const unsigned* heights, + unsigned numROIs) = 0; + virtual int GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths, + unsigned* heights, unsigned* length) = 0; + /** + * Starts continuous acquisition. + */ + virtual int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow) = 0; + /** + * Starts Sequence Acquisition with given interval. + * Most camera adapters will ignore this number + * */ + virtual int StartSequenceAcquisition(double interval_ms) = 0; + /** + * Stops an ongoing sequence acquisition + */ + virtual int StopSequenceAcquisition() = 0; + /** + * Sets up the camera so that Sequence acquisition can start without delay + */ + virtual int PrepareSequenceAcqusition() = 0; + /** + * Flag to indicate whether Sequence Acquisition is currently running. + * Return true when Sequence acquisition is active, false otherwise + */ + virtual bool IsCapturing() = 0; + + /** + * Get the metadata tags stored in this device. + * These tags will automatically be add to the metadata of an image inserted + * into the circular buffer + * + */ + virtual void GetTags(char* serializedMetadata) = 0; + + /** + * Adds new tag or modifies the value of an existing one + * These will automatically be added to images inserted into the circular buffer. + * Use this mechanism for tags that do not change often. For metadata that + * change often, create an instance of metadata yourself and add to one of + * the versions of the InsertImage function + */ + virtual void AddTag(const char* key, const char* deviceLabel, const char* value) = 0; + + /** + * Removes an existing tag from the metadata associated with this device + * These tags will automatically be add to the metadata of an image inserted + * into the circular buffer + */ + virtual void RemoveTag(const char* key) = 0; + + /** + * Returns whether a camera's exposure time can be sequenced. + * If returning true, then a Camera adapter class should also inherit + * the SequenceableExposure class and implement its methods. + */ + virtual int IsExposureSequenceable(bool& isSequenceable) const = 0; + + // Sequence functions + // Sequences can be used for fast acquisitions, synchronized by TTLs rather than + // computer commands. + // Sequences of exposures can be uploaded to the camera. The camera will cycle through + // the uploaded list of exposures (triggered by either an internal or + // external trigger). If the device is capable (and ready) to do so isSequenceable will + // be true. If your device can not execute this (true for most cameras) + // simply set IsExposureSequenceable to false + virtual int GetExposureSequenceMaxLength(long& nrEvents) const = 0; + virtual int StartExposureSequence() = 0; + virtual int StopExposureSequence() = 0; + // Remove all values in the sequence + virtual int ClearExposureSequence() = 0; + // Add one value to the sequence + virtual int AddToExposureSequence(double exposureTime_ms) = 0; + // Signal that we are done sending sequence values so that the adapter can send the whole sequence to the device + virtual int SendExposureSequence() const = 0; + }; + + } // namespace MM diff --git a/MMDevice/MMDeviceConstants.h b/MMDevice/MMDeviceConstants.h index 956b05474..6740bd895 100644 --- a/MMDevice/MMDeviceConstants.h +++ b/MMDevice/MMDeviceConstants.h @@ -216,7 +216,8 @@ namespace MM { MagnifierDevice, SLMDevice, HubDevice, - GalvoDevice + GalvoDevice, + StorageDevice }; enum PropertyType { From b616a7c3b7421782529d4d2f822537424ecc1c2f Mon Sep 17 00:00:00 2001 From: Nenad Amodaj Date: Wed, 3 Apr 2024 13:31:53 -0700 Subject: [PATCH 03/61] go2scope device introduced --- DeviceAdapters/go2scope/go2scope.cpp | 195 ++++++++++++++++++ DeviceAdapters/go2scope/go2scope.h | 81 ++++++++ DeviceAdapters/go2scope/go2scope.vcxproj | 110 ++++++++++ .../go2scope/go2scope.vcxproj.filters | 21 ++ MMDevice/DeviceBase.h | 8 + MMDevice/MMDevice.cpp | 1 + MMDevice/MMDevice.h | 184 +++-------------- micromanager.sln | 11 +- 8 files changed, 455 insertions(+), 156 deletions(-) create mode 100644 DeviceAdapters/go2scope/go2scope.cpp create mode 100644 DeviceAdapters/go2scope/go2scope.h create mode 100644 DeviceAdapters/go2scope/go2scope.vcxproj create mode 100644 DeviceAdapters/go2scope/go2scope.vcxproj.filters diff --git a/DeviceAdapters/go2scope/go2scope.cpp b/DeviceAdapters/go2scope/go2scope.cpp new file mode 100644 index 000000000..454b44f16 --- /dev/null +++ b/DeviceAdapters/go2scope/go2scope.cpp @@ -0,0 +1,195 @@ +/////////////////////////////////////////////////////////////////////////////// +// FILE: Go2Scope.cpp +// PROJECT: Micro-Manager +// SUBSYSTEM: DeviceAdapters +//----------------------------------------------------------------------------- +// DESCRIPTION: Go2Scope devices. Includes the experimental StorageDevice +// +// AUTHOR: Nenad Amodaj +// +// COPYRIGHT: Nenad Amodaj, Chan Zuckerberg Initiative, 2024 +// +// LICENSE: This file is distributed under the BSD license. +// License text is included with the source distribution. +// +// This file is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// +// IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. +// +// NOTE: Storage Device development is supported in part by +// Chan Zuckerberg Initiative (CZI) +// +/////////////////////////////////////////////////////////////////////////////// +#include "go2scope.h" +#include "ModuleInterface.h" + +using namespace std; + + +/////////////////////////////////////////////////////////////////////////////// +// Exported MMDevice API +/////////////////////////////////////////////////////////////////////////////// +MODULE_API void InitializeModuleData() +{ + RegisterDevice(g_MMV1Storage, MM::StorageDevice, "Storage for old MM format"); +} + +MODULE_API MM::Device* CreateDevice(const char* deviceName) +{ + if (deviceName == 0) + return 0; + + if (strcmp(deviceName, g_MMV1Storage) == 0) + { + return new MMV1Storage(); + } + + return 0; +} + +MODULE_API void DeleteDevice(MM::Device* pDevice) +{ + delete pDevice; +} + + +/////////////////////////////////////////////////////////////////////////////// +// Lida + +MMV1Storage::MMV1Storage() : + initialized(false) +{ + InitializeDefaultErrorMessages(); + + // set device specific error messages + SetErrorText(ERR_INTERNAL, "Internal driver error, see log file for details"); + + + // create pre-initialization properties + // ------------------------------------ + // + + // Name + CreateProperty(MM::g_Keyword_Name, g_MMV1Storage, MM::String, true); + // + // Description + CreateProperty(MM::g_Keyword_Description, "Storage for old MM format", MM::String, true); +} + +MMV1Storage::~MMV1Storage() +{ + Shutdown(); +} + +void MMV1Storage::GetName(char* Name) const +{ + CDeviceUtils::CopyLimitedString(Name, g_MMV1Storage); +} + +int MMV1Storage::Initialize() +{ + if (initialized) + return DEVICE_OK; + + int ret(DEVICE_OK); + + UpdateStatus(); + + initialized = true; + return DEVICE_OK; +} + +int MMV1Storage::Shutdown() +{ + if (initialized) + { + initialized = false; + } + return DEVICE_OK; +} + +// Never busy because all commands block +bool MMV1Storage::Busy() +{ + return false; +} + +int MMV1Storage::Create(const char* path, const char* name, int numberOfDimensions, const int shape[], const char* meta, char* handle) +{ + return 0; +} + +int MMV1Storage::ConfigureDimension(const char* handle, int dimension, const char* name, const char* meaning) +{ + return 0; +} + +int MMV1Storage::ConfigureCoordinate(const char* handle, int dimension, int coordinate, const char* name) +{ + return 0; +} + +int MMV1Storage::Close(const char* handle) +{ + return 0; +} + +int MMV1Storage::Load(const char* path, const char* name, char* handle) +{ + return 0; +} + +int MMV1Storage::Delete(char* handle) +{ + return 0; +} + +int MMV1Storage::List(const char* path, char** listOfDatasets) +{ + return 0; +} + +int MMV1Storage::AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta) +{ + return 0; +} + +int MMV1Storage::GetSummaryMeta(const char* handle, char* meta) +{ + return 0; +} + +int MMV1Storage::GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta) +{ + return 0; +} + +const unsigned char* MMV1Storage::GetImage(const char* handle, int coordinates[], int numCoordinates) +{ + return nullptr; +} + +int MMV1Storage::GetNumberOfDimensions(const char* handle, int& numDimensions) +{ + return 0; +} + +int MMV1Storage::GetDimension(const char* handle, int dimension, char* name, int nameLength, char* meaning, int meaningLength) +{ + return 0; +} + +int MMV1Storage::GetCoordinate(const char* handle, int dimension, int coordinate, char* name, int nameLength) +{ + return 0; +} + + +/////////////////////////////////////////////////////////////////////////////// +// Action handlers +/////////////////////////////////////////////////////////////////////////////// + diff --git a/DeviceAdapters/go2scope/go2scope.h b/DeviceAdapters/go2scope/go2scope.h new file mode 100644 index 000000000..5d99265ed --- /dev/null +++ b/DeviceAdapters/go2scope/go2scope.h @@ -0,0 +1,81 @@ +/////////////////////////////////////////////////////////////////////////////// +// FILE: Go2Scope.cpp +// PROJECT: Micro-Manager +// SUBSYSTEM: DeviceAdapters +//----------------------------------------------------------------------------- +// DESCRIPTION: Go2Scope devices. Includes the experimental StorageDevice +// +// AUTHOR: Nenad Amodaj +// +// COPYRIGHT: Nenad Amodaj, Chan Zuckerberg Initiative, 2024 +// +// LICENSE: This file is distributed under the BSD license. +// License text is included with the source distribution. +// +// This file is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// +// IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. +// +// NOTE: Storage Device development is supported in part by +// Chan Zuckerberg Initiative (CZI) +// +/////////////////////////////////////////////////////////////////////////////// + +#pragma once + +#include "MMDevice.h" +#include "DeviceBase.h" + +////////////////////////////////////////////////////////////////////////////// +// Error codes +// + +#define ERR_PARAMETER_ERROR 144001 +#define ERR_INTERNAL 144002 + +static const char* g_Go2Scope = "Go2Scope"; +static const char* g_MMV1Storage = "MMV1Storage"; + + +class MMV1Storage : public CStorageBase +{ +public: + MMV1Storage(); + virtual ~MMV1Storage(); + + // Device API + // ---------- + int Initialize(); + int Shutdown(); + + void GetName(char* pszName) const; + bool Busy(); + + // Storage API + // ----------- + int Create(const char* path, const char* name, int numberOfDimensions, const int shape[], const char* meta, char* handle); + int ConfigureDimension(const char* handle, int dimension, const char* name, const char* meaning); + int ConfigureCoordinate(const char* handle, int dimension, int coordinate, const char* name); + int Close(const char* handle); + int Load(const char* path, const char* name, char* handle); + int Delete(char* handle); + int List(const char* path, char** listOfDatasets); + int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta); + int GetSummaryMeta(const char* handle, char* meta); + int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta); + const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates); + int GetNumberOfDimensions(const char* handle, int& numDimensions); + int GetDimension(const char* handle, int dimension, char* name, int nameLength, char* meaning, int meaningLength); + int GetCoordinate(const char* handle, int dimension, int coordinate, char* name, int nameLength); + + // action interface + // ---------------- + +private: + bool initialized; +}; + diff --git a/DeviceAdapters/go2scope/go2scope.vcxproj b/DeviceAdapters/go2scope/go2scope.vcxproj new file mode 100644 index 000000000..eac8515e1 --- /dev/null +++ b/DeviceAdapters/go2scope/go2scope.vcxproj @@ -0,0 +1,110 @@ + + + + + Debug + x64 + + + Release + x64 + + + + Go2Scope + {2916e620-1157-4154-8223-887d383e9de6} + Go2Scope + Win32Proj + 10.0 + + + + DynamicLibrary + MultiByte + v143 + false + + + DynamicLibrary + MultiByte + v143 + true + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + true + false + + + + X64 + + + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + EnableFastChecks + true + + + 4290;%(DisableSpecificWarnings) + %(AdditionalIncludeDirectories) + + + Windows + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + X64 + + + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + 4290;%(DisableSpecificWarnings) + %(AdditionalIncludeDirectories) + + + Windows + true + true + + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + + + + + + + + + + + {b8c95f39-54bf-40a9-807b-598df2821d55} + + + + + + \ No newline at end of file diff --git a/DeviceAdapters/go2scope/go2scope.vcxproj.filters b/DeviceAdapters/go2scope/go2scope.vcxproj.filters new file mode 100644 index 000000000..12a8460c5 --- /dev/null +++ b/DeviceAdapters/go2scope/go2scope.vcxproj.filters @@ -0,0 +1,21 @@ + + + + + {52a0a423-e1bc-49cf-9983-c785611e671f} + + + {891fcdc1-6279-4733-a91f-9e785177f914} + + + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/MMDevice/DeviceBase.h b/MMDevice/DeviceBase.h index fc3d80c68..b18887d3e 100644 --- a/MMDevice/DeviceBase.h +++ b/MMDevice/DeviceBase.h @@ -2480,6 +2480,14 @@ class CStateDeviceBase : public CDeviceBase std::map labels_; }; +/** +* Base class for creating Storage Device adapters. +*/ +template +class CStorageBase : public CDeviceBase +{ +}; + // _t, a macro for timing single lines. // This macros logs the text of the line, x, measures diff --git a/MMDevice/MMDevice.cpp b/MMDevice/MMDevice.cpp index 36c82ef97..94a62a182 100644 --- a/MMDevice/MMDevice.cpp +++ b/MMDevice/MMDevice.cpp @@ -47,5 +47,6 @@ const DeviceType Magnifier::Type = MagnifierDevice; const DeviceType SLM::Type = SLMDevice; const DeviceType Galvo::Type = GalvoDevice; const DeviceType Hub::Type = HubDevice; +const DeviceType Storage::Type = StorageDevice; } // namespace MM diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index 7d5f1ec60..4126501a4 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -28,7 +28,8 @@ // Header version // If any of the class definitions changes, the interface version // must be incremented -#define DEVICE_INTERFACE_VERSION 71 +#define DEVICE_INTERFACE_VERSION 800 +// TODO: determine the correct version number /////////////////////////////////////////////////////////////////////////////// // N.B. @@ -1364,8 +1365,20 @@ namespace MM { * Create new dataset in the location path/name. Fails if the path already exists, or if the number of dimensions less than 1. * The caller should save the "handle" output parameter to refer to this dataset in subsequent code. */ - virtual int Create(const char* path, const char* name, int numberOfDimensions, const char* meta, char* handle) = 0; - + virtual int Create(const char* path, const char* name, int numberOfDimensions, const int shape[], const char* meta, char* handle) = 0; + + /** + * Configure dimension + * Configures image dimensions. + */ + virtual int ConfigureDimension(const char* handle, int dimension, const char* name, const char* meaning) = 0; + + /** + * Configure coordinate + * Configures name of the coordinate + */ + virtual int ConfigureCoordinate(const char* handle, int dimension, int coordinate, const char* name) = 0; + /** * Close * Closes the dataset. After the dataset is closed its handle becomes invalid. @@ -1389,176 +1402,39 @@ namespace MM { /** * Returns a list of dataset names located in a given path. - * TODO: exact behavior of this call should be elaborated + * TODO: exact behavior of this call should be elaborated, including + * the format and memory management of the returned list. */ - virtual int List(const char* path, const char** listOfDatasets) const = 0; + virtual int List(const char* path, char** listOfDatasets) = 0; /** - * Returns the name for each component + * Inserts an image into the dataset */ virtual int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta) = 0; /** - * Returns the number of simultaneous channels that camera is capable of. - * This should be used by devices capable of generating multiple channels of imagedata simultaneously. - * Note: this should not be used by color cameras (use getNumberOfComponents instead). - */ - virtual int unsigned GetNumberOfChannels() const = 0; - /** - * Returns the name for each Channel. - * An implementation of this function is provided in DeviceBase.h. It will return an empty string - */ - virtual int GetChannelName(unsigned channel, char* name) = 0; - /** - * Returns the size in bytes of the image buffer. - * Required by the MM::Camera API. - * For multi-channel cameras, return the size of a single channel - */ - virtual long GetImageBufferSize() const = 0; - /** - * Returns image buffer X-size in pixels. - * Required by the MM::Camera API. - */ - virtual unsigned GetImageWidth() const = 0; - /** - * Returns image buffer Y-size in pixels. - * Required by the MM::Camera API. - */ - virtual unsigned GetImageHeight() const = 0; - /** - * Returns image buffer pixel depth in bytes. - * Required by the MM::Camera API. - */ - virtual unsigned GetImageBytesPerPixel() const = 0; - /** - * Returns the bit depth (dynamic range) of the pixel. - * This does not affect the buffer size, it just gives the client application - * a guideline on how to interpret pixel values. - * Required by the MM::Camera API. - */ - virtual unsigned GetBitDepth() const = 0; - /** - * Returns binnings factor. Used to calculate current pixelsize - * Not appropriately named. Implemented in DeviceBase.h - */ - virtual double GetPixelSizeUm() const = 0; - /** - * Returns the current binning factor. - */ - virtual int GetBinning() const = 0; - /** - * Sets binning factor. - */ - virtual int SetBinning(int binSize) = 0; - /** - * Sets exposure in milliseconds. - */ - virtual void SetExposure(double exp_ms) = 0; - /** - * Returns the current exposure setting in milliseconds. - */ - virtual double GetExposure() const = 0; - /** - * Sets the camera Region Of Interest. - * Required by the MM::Camera API. - * This command will change the dimensions of the image. - * Depending on the hardware capabilities the camera may not be able to configure the - * exact dimensions requested - but should try do as close as possible. - * If the hardware does not have this capability the software should simulate the ROI by - * appropriately cropping each frame. - * @param x - top-left corner coordinate - * @param y - top-left corner coordinate - * @param xSize - width - * @param ySize - height - */ - virtual int SetROI(unsigned x, unsigned y, unsigned xSize, unsigned ySize) = 0; - /** - * Returns the actual dimensions of the current ROI. - */ - virtual int GetROI(unsigned& x, unsigned& y, unsigned& xSize, unsigned& ySize) = 0; - /** - * Resets the Region of Interest to full frame. - */ - virtual int ClearROI() = 0; - virtual bool SupportsMultiROI() = 0; - virtual bool IsMultiROISet() = 0; - virtual int GetMultiROICount(unsigned& count) = 0; - virtual int SetMultiROI(const unsigned* xs, const unsigned* ys, - const unsigned* widths, const unsigned* heights, - unsigned numROIs) = 0; - virtual int GetMultiROI(unsigned* xs, unsigned* ys, unsigned* widths, - unsigned* heights, unsigned* length) = 0; - /** - * Starts continuous acquisition. + * Returns summary metadata */ - virtual int StartSequenceAcquisition(long numImages, double interval_ms, bool stopOnOverflow) = 0; - /** - * Starts Sequence Acquisition with given interval. - * Most camera adapters will ignore this number - * */ - virtual int StartSequenceAcquisition(double interval_ms) = 0; - /** - * Stops an ongoing sequence acquisition - */ - virtual int StopSequenceAcquisition() = 0; - /** - * Sets up the camera so that Sequence acquisition can start without delay - */ - virtual int PrepareSequenceAcqusition() = 0; - /** - * Flag to indicate whether Sequence Acquisition is currently running. - * Return true when Sequence acquisition is active, false otherwise - */ - virtual bool IsCapturing() = 0; + virtual int GetSummaryMeta(const char* handle, char* meta) = 0; /** - * Get the metadata tags stored in this device. - * These tags will automatically be add to the metadata of an image inserted - * into the circular buffer - * + * Returns summary metadata */ - virtual void GetTags(char* serializedMetadata) = 0; + virtual int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta) = 0; /** - * Adds new tag or modifies the value of an existing one - * These will automatically be added to images inserted into the circular buffer. - * Use this mechanism for tags that do not change often. For metadata that - * change often, create an instance of metadata yourself and add to one of - * the versions of the InsertImage function + * Returns image pixels */ - virtual void AddTag(const char* key, const char* deviceLabel, const char* value) = 0; + virtual const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates) = 0; /** - * Removes an existing tag from the metadata associated with this device - * These tags will automatically be add to the metadata of an image inserted - * into the circular buffer + * Returns dimensions of the dataset */ - virtual void RemoveTag(const char* key) = 0; + virtual int GetNumberOfDimensions(const char* handle, int& numDimensions) = 0; - /** - * Returns whether a camera's exposure time can be sequenced. - * If returning true, then a Camera adapter class should also inherit - * the SequenceableExposure class and implement its methods. - */ - virtual int IsExposureSequenceable(bool& isSequenceable) const = 0; + virtual int GetDimension(const char* handle, int dimension, char* name, int nameLength, char* meaning, int meaningLength) = 0; - // Sequence functions - // Sequences can be used for fast acquisitions, synchronized by TTLs rather than - // computer commands. - // Sequences of exposures can be uploaded to the camera. The camera will cycle through - // the uploaded list of exposures (triggered by either an internal or - // external trigger). If the device is capable (and ready) to do so isSequenceable will - // be true. If your device can not execute this (true for most cameras) - // simply set IsExposureSequenceable to false - virtual int GetExposureSequenceMaxLength(long& nrEvents) const = 0; - virtual int StartExposureSequence() = 0; - virtual int StopExposureSequence() = 0; - // Remove all values in the sequence - virtual int ClearExposureSequence() = 0; - // Add one value to the sequence - virtual int AddToExposureSequence(double exposureTime_ms) = 0; - // Signal that we are done sending sequence values so that the adapter can send the whole sequence to the device - virtual int SendExposureSequence() const = 0; + virtual int GetCoordinate(const char* handle, int dimension, int coordinate, char* name, int nameLength) = 0; }; diff --git a/micromanager.sln b/micromanager.sln index 9106a1760..7d7cfad01 100644 --- a/micromanager.sln +++ b/micromanager.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.32802.440 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34221.43 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MMCore", "MMCore\MMCore.vcxproj", "{36571628-728C-4ACD-A47F-503BA91C5D43}" EndProject @@ -481,10 +481,13 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ThorlabsCHROLIS", "DeviceAdapters\ThorlabsCHROLIS\ThorlabsCHROLIS.vcxproj", "{F93128A5-B344-4662-BFB8-B4CAECF1FE52}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IDSPeak", "DeviceAdapters\IDSPeak\IDSPeak.vcxproj", "{823CF77E-8120-41B1-9B25-823A79C93198}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QSI", "DeviceAdapters\QSI\QSI.vcxproj", "{320AF64E-C4FC-4A97-A7D1-F8233A8A44C7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NotificationTester", "DeviceAdapters\NotificationTester\NotificationTester.vcxproj", "{7C8C60FA-92E3-4102-80AB-A4468C4FCD2F}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Go2Scope", "DeviceAdapters\go2scope\go2scope.vcxproj", "{2916E620-1157-4154-8223-887D383E9DE6}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -1459,6 +1462,10 @@ Global {7C8C60FA-92E3-4102-80AB-A4468C4FCD2F}.Debug|x64.Build.0 = Debug|x64 {7C8C60FA-92E3-4102-80AB-A4468C4FCD2F}.Release|x64.ActiveCfg = Release|x64 {7C8C60FA-92E3-4102-80AB-A4468C4FCD2F}.Release|x64.Build.0 = Release|x64 + {2916E620-1157-4154-8223-887D383E9DE6}.Debug|x64.ActiveCfg = Debug|x64 + {2916E620-1157-4154-8223-887D383E9DE6}.Debug|x64.Build.0 = Debug|x64 + {2916E620-1157-4154-8223-887D383E9DE6}.Release|x64.ActiveCfg = Release|x64 + {2916E620-1157-4154-8223-887D383E9DE6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 35acc6a709b857ee84a20c2e6d7ed2dfd93ec3b3 Mon Sep 17 00:00:00 2001 From: Nenad Amodaj Date: Wed, 3 Apr 2024 18:53:00 -0700 Subject: [PATCH 04/61] Storage instance added and MMCore plumbing --- MMCore/Devices/DeviceInstances.h | 1 + MMCore/Devices/StorageInstance.cpp | 35 +++++++++++++++++++ MMCore/Devices/StorageInstance.h | 54 ++++++++++++++++++++++++++++++ MMCore/MMCore.cpp | 54 ++++++++++++++++++++++++++++++ MMCore/MMCore.h | 10 ++++++ MMCore/MMCore.vcxproj | 2 ++ MMCore/MMCore.vcxproj.filters | 8 ++++- MMDevice/MMDeviceConstants.h | 1 + 8 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 MMCore/Devices/StorageInstance.cpp create mode 100644 MMCore/Devices/StorageInstance.h diff --git a/MMCore/Devices/DeviceInstances.h b/MMCore/Devices/DeviceInstances.h index 8dfacf4d7..33b7d34f9 100644 --- a/MMCore/Devices/DeviceInstances.h +++ b/MMCore/Devices/DeviceInstances.h @@ -33,3 +33,4 @@ #include "SLMInstance.h" #include "GalvoInstance.h" #include "HubInstance.h" +#include "StorageInstance.h" diff --git a/MMCore/Devices/StorageInstance.cpp b/MMCore/Devices/StorageInstance.cpp new file mode 100644 index 000000000..77db38462 --- /dev/null +++ b/MMCore/Devices/StorageInstance.cpp @@ -0,0 +1,35 @@ +// PROJECT: Micro-Manager +// SUBSYSTEM: MMCore +// +// DESCRIPTION: Camera device instance wrapper +// +// COPYRIGHT: University of California, San Francisco, 2014, +// Nenad Amodaj 2024 +// All Rights reserved +// +// LICENSE: This file is distributed under the "Lesser GPL" (LGPL) license. +// License text is included with the source distribution. +// +// This file is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// +// IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. +// +// AUTHOR: Nenad Amodaj + +#include "StorageInstance.h" + +int StorageInstance::Create(const char* path, const char* name, std::vector shape, const char* meta, std::string& handle) +{ + RequireInitialized(__func__); + + char cHandle[MM::MaxStrLength]; + int ret = GetImpl()->Create(path, name, (int)shape.size(), &shape[0], meta, cHandle); + if (ret != DEVICE_OK) + return ret; + + return DEVICE_OK; +} diff --git a/MMCore/Devices/StorageInstance.h b/MMCore/Devices/StorageInstance.h new file mode 100644 index 000000000..95706f522 --- /dev/null +++ b/MMCore/Devices/StorageInstance.h @@ -0,0 +1,54 @@ +// PROJECT: Micro-Manager +// SUBSYSTEM: MMCore +// +// COPYRIGHT: University of California, San Francisco, 2014, +// Nenad Amodaj 2024 +// All Rights reserved +// +// LICENSE: This file is distributed under the "Lesser GPL" (LGPL) license. +// License text is included with the source distribution. +// +// This file is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty +// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +// +// IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES. +// +// AUTHOR: Nenad Amodaj + +#pragma once + +#include "DeviceInstanceBase.h" + + +class StorageInstance : public DeviceInstanceBase +{ +public: + StorageInstance(CMMCore* core, + std::shared_ptr adapter, + const std::string& name, + MM::Device* pDevice, + DeleteDeviceFunction deleteFunction, + const std::string& label, + mm::logging::Logger deviceLogger, + mm::logging::Logger coreLogger) : + DeviceInstanceBase(core, adapter, name, pDevice, deleteFunction, label, deviceLogger, coreLogger) {} + + int Create(const char* path, const char* name, std::vector shape, const char* meta, std::string& handle); + int ConfigureDimension(const char* handle, int dimension, const char* name, const char* meaning); + int ConfigureCoordinate(const char* handle, int dimension, int coordinate, const char* name); + int Close(const char* handle); + int Load(const char* path, const char* name, char* handle); + int Delete(char* handle); + int List(const char* path, char** listOfDatasets); + int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta); + int GetSummaryMeta(const char* handle, char* meta); + int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta); + const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates); + int GetNumberOfDimensions(const char* handle, int& numDimensions); + int GetDimension(const char* handle, int dimension, char* name, int nameLength, char* meaning, int meaningLength); + int GetCoordinate(const char* handle, int dimension, int coordinate, char* name, int nameLength); + +}; diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index 4bef95471..60c7cde03 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7544,6 +7544,60 @@ std::vector CMMCore::getLoadedPeripheralDevices(const char* hubLabe return deviceManager_->GetLoadedPeripherals(hubLabel); } +void CMMCore::setStorageDevice(const char* storageLabel) throw(CMMError) +{ + // TODO: prevent setting storage device if the current one has any datasets open + + if (storageLabel && strlen(storageLabel) > 0) + { + currentStorage_ = + deviceManager_->GetDeviceOfType(storageLabel); + LOG_INFO(coreLogger_) << "Default storage set to " << storageLabel; + } + else + { + currentStorage_.reset(); + LOG_INFO(coreLogger_) << "Default storage unset"; + } + properties_->Refresh(); + + std::string newStorageLabel = getStorageDevice(); + { + MMThreadGuard scg(stateCacheLock_); + stateCache_.addSetting(PropertySetting(MM::g_Keyword_CoreDevice, MM::g_Keyword_CoreCamera, newStorageLabel.c_str())); + } + +} + +std::string CMMCore::getStorageDevice() throw(CMMError) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + return storage->GetLabel(); + } + return std::string(); +} + +/** + * Creates a new dataset in the current storage device. + */ +std::string CMMCore::createDataset(const char* path, const char* name, std::vector shape, const char* meta) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + std::string handle; + int ret = storage->Create(path, name, shape, meta, handle); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + } + } + std::string CMMCore::getInstalledDeviceDescription(const char* hubLabel, const char* deviceLabel) throw (CMMError) { std::shared_ptr pHub = diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index d06d86013..47ee66373 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -105,6 +105,7 @@ class SLMInstance; class ShutterInstance; class StageInstance; class XYStageInstance; +class StorageInstance; class CMMCore; @@ -278,6 +279,7 @@ class CMMCore std::string getSLMDevice(); std::string getGalvoDevice(); std::string getChannelGroup(); + std::string getStorageDevice(); void setCameraDevice(const char* cameraLabel) throw (CMMError); void setShutterDevice(const char* shutterLabel) throw (CMMError); void setFocusDevice(const char* focusLabel) throw (CMMError); @@ -287,6 +289,8 @@ class CMMCore void setSLMDevice(const char* slmLabel) throw (CMMError); void setGalvoDevice(const char* galvoLabel) throw (CMMError); void setChannelGroup(const char* channelGroup) throw (CMMError); + void setStorageDevice(const char* storageLabel) throw (CMMError); + ///@} /** \name System state cache. @@ -625,6 +629,11 @@ class CMMCore std::vector getLoadedPeripheralDevices(const char* hubLabel) throw (CMMError); ///@} + /** \name Storage API */ + ///@{ + std::string createDataset(const char* path, const char* name, std::vector shape, const char* meta); + ///@} + private: // make object non-copyable CMMCore(const CMMCore&); @@ -647,6 +656,7 @@ class CMMCore std::weak_ptr currentSLMDevice_; std::weak_ptr currentGalvoDevice_; std::weak_ptr currentImageProcessor_; + std::weak_ptr currentStorage_; std::string channelGroup_; long pollingIntervalMs_; diff --git a/MMCore/MMCore.vcxproj b/MMCore/MMCore.vcxproj index 188ad4151..98b7ce851 100644 --- a/MMCore/MMCore.vcxproj +++ b/MMCore/MMCore.vcxproj @@ -94,6 +94,7 @@ + @@ -137,6 +138,7 @@ + diff --git a/MMCore/MMCore.vcxproj.filters b/MMCore/MMCore.vcxproj.filters index 1920583b6..ae1f3deb7 100644 --- a/MMCore/MMCore.vcxproj.filters +++ b/MMCore/MMCore.vcxproj.filters @@ -141,6 +141,9 @@ Source Files + + Source Files\Devices + @@ -305,5 +308,8 @@ Header Files + + Header Files\Devices + - + \ No newline at end of file diff --git a/MMDevice/MMDeviceConstants.h b/MMDevice/MMDeviceConstants.h index 6740bd895..5e27bed12 100644 --- a/MMDevice/MMDeviceConstants.h +++ b/MMDevice/MMDeviceConstants.h @@ -130,6 +130,7 @@ namespace MM { const char* const g_Keyword_CoreImageProcessor = "ImageProcessor"; const char* const g_Keyword_CoreSLM = "SLM"; const char* const g_Keyword_CoreGalvo = "Galvo"; + const char* const g_Keyword_CoreStorage = "Storage"; const char* const g_Keyword_CoreTimeoutMs = "TimeoutMs"; const char* const g_Keyword_Channel = "Channel"; const char* const g_Keyword_Version = "Version"; From 8d0d52b8da8d962ba8c605d883ec0ef8a0845382 Mon Sep 17 00:00:00 2001 From: namodaj Date: Fri, 5 Apr 2024 12:44:28 -0700 Subject: [PATCH 05/61] storage instance: further work --- MMCore/Devices/StorageInstance.cpp | 89 +++++++++++++++++++++++++++++- MMCore/Devices/StorageInstance.h | 18 +++--- micromanagerSD.slnf | 1 + 3 files changed, 96 insertions(+), 12 deletions(-) diff --git a/MMCore/Devices/StorageInstance.cpp b/MMCore/Devices/StorageInstance.cpp index 77db38462..608fd55dc 100644 --- a/MMCore/Devices/StorageInstance.cpp +++ b/MMCore/Devices/StorageInstance.cpp @@ -22,14 +22,97 @@ #include "StorageInstance.h" -int StorageInstance::Create(const char* path, const char* name, std::vector shape, const char* meta, std::string& handle) +int StorageInstance::Create(const char* path, const char* name, const std::vector& shape, const char* meta, std::string& handle) { RequireInitialized(__func__); char cHandle[MM::MaxStrLength]; int ret = GetImpl()->Create(path, name, (int)shape.size(), &shape[0], meta, cHandle); - if (ret != DEVICE_OK) - return ret; + if (ret == DEVICE_OK) + handle = cHandle; return DEVICE_OK; } + +int StorageInstance::ConfigureDimension(const char* handle, int dimension, const char* name, const char* meaning) +{ + RequireInitialized(__func__); + + return GetImpl()->ConfigureDimension(handle, dimension, name, meaning); +} + +int StorageInstance::ConfigureCoordinate(const char* handle, int dimension, int coordinate, const char* name) +{ + RequireInitialized(__func__); + + return GetImpl()->ConfigureCoordinate(handle, dimension, coordinate, name); +} + +int StorageInstance::Close(const char* handle) +{ + RequireInitialized(__func__); + + return GetImpl()->Close(handle); +} + +int StorageInstance::Load(const char* path, const char* name, std::string& handle) +{ + RequireInitialized(__func__); + + char cHandle[MM::MaxStrLength]; + int ret = GetImpl()->Load(path, name, cHandle); + if (ret == DEVICE_OK) + handle = cHandle; + + return ret; +} + +int StorageInstance::Delete(char* handle) +{ + RequireInitialized(__func__); + + return GetImpl()->Delete(handle); +} + +int StorageInstance::List(const char* path, std::vector& listOfDatasets) +{ + RequireInitialized(__func__); + char** cList; + // TODO allocate and populate the list + return GetImpl()->List(path, cList); +} + +int StorageInstance::AddImage(const std::vector& pixels, const std::vector& coordinates, const char* imageMeta) +{ + return 0; +} + +int StorageInstance::GetSummaryMeta(const char* handle, char* meta) +{ + return 0; +} + +int StorageInstance::GetImageMeta(const char* handle, const std::vector& coordinates, char* meta) +{ + return 0; +} + +const unsigned char* StorageInstance::GetImage(const char* handle, const std::vector& coordinates) +{ + return nullptr; +} + +int StorageInstance::GetNumberOfDimensions(const char* handle) +{ + return 0; +} + +int StorageInstance::GetDimension(const char* handle, int dimension, std::string& name, std::string& meaning) +{ + return 0; +} + +int StorageInstance::GetCoordinate(const char* handle, int dimension, int coordinate, std::string& name) +{ + return 0; +} diff --git a/MMCore/Devices/StorageInstance.h b/MMCore/Devices/StorageInstance.h index 95706f522..c2ba11921 100644 --- a/MMCore/Devices/StorageInstance.h +++ b/MMCore/Devices/StorageInstance.h @@ -36,19 +36,19 @@ class StorageInstance : public DeviceInstanceBase mm::logging::Logger coreLogger) : DeviceInstanceBase(core, adapter, name, pDevice, deleteFunction, label, deviceLogger, coreLogger) {} - int Create(const char* path, const char* name, std::vector shape, const char* meta, std::string& handle); + int Create(const char* path, const char* name, const std::vector& shape, const char* meta, std::string& handle); int ConfigureDimension(const char* handle, int dimension, const char* name, const char* meaning); int ConfigureCoordinate(const char* handle, int dimension, int coordinate, const char* name); int Close(const char* handle); - int Load(const char* path, const char* name, char* handle); + int Load(const char* path, const char* name, std::string& handle); int Delete(char* handle); - int List(const char* path, char** listOfDatasets); - int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta); + int List(const char* path, std::vector& datasets); + int AddImage(const std::vector& pixels, const std::vector& coordinates, const char* imageMeta); int GetSummaryMeta(const char* handle, char* meta); - int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta); - const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates); - int GetNumberOfDimensions(const char* handle, int& numDimensions); - int GetDimension(const char* handle, int dimension, char* name, int nameLength, char* meaning, int meaningLength); - int GetCoordinate(const char* handle, int dimension, int coordinate, char* name, int nameLength); + int GetImageMeta(const char* handle, const std::vector& coordinates, char* meta); + const unsigned char* GetImage(const char* handle, const std::vector& coordinates); + int GetNumberOfDimensions(const char* handle); + int GetDimension(const char* handle, int dimension, std::string& name, std::string& meaning); + int GetCoordinate(const char* handle, int dimension, int coordinate, std::string& name); }; diff --git a/micromanagerSD.slnf b/micromanagerSD.slnf index a0b85618e..bff398896 100644 --- a/micromanagerSD.slnf +++ b/micromanagerSD.slnf @@ -3,6 +3,7 @@ "path": "micromanager.sln", "projects": [ "DeviceAdapters\\DemoCamera\\DemoCamera.vcxproj", + "DeviceAdapters\\go2scope\\go2scope.vcxproj", "MMCoreJ_wrap\\MMCoreJ_wrap.vcxproj", "MMCore\\MMCore.vcxproj", "MMDevice\\MMDevice-SharedRuntime.vcxproj", From f34d40f349d455a491039a5de85e91866f447c15 Mon Sep 17 00:00:00 2001 From: namodaj Date: Fri, 5 Apr 2024 19:42:22 -0700 Subject: [PATCH 06/61] Storage API cleanup --- DeviceAdapters/go2scope/go2scope.cpp | 4 ++-- DeviceAdapters/go2scope/go2scope.h | 4 ++-- MMCore/Devices/StorageInstance.cpp | 34 ++++++++++++++++++++++------ MMCore/Devices/StorageInstance.h | 2 +- MMCore/MMCore.cpp | 2 ++ MMDevice/MMDevice.h | 4 ++-- 6 files changed, 36 insertions(+), 14 deletions(-) diff --git a/DeviceAdapters/go2scope/go2scope.cpp b/DeviceAdapters/go2scope/go2scope.cpp index 454b44f16..cb6866bd0 100644 --- a/DeviceAdapters/go2scope/go2scope.cpp +++ b/DeviceAdapters/go2scope/go2scope.cpp @@ -148,12 +148,12 @@ int MMV1Storage::Delete(char* handle) return 0; } -int MMV1Storage::List(const char* path, char** listOfDatasets) +int MMV1Storage::List(const char* path, char** listOfDatasets, int maxItems, int maxItemLength) { return 0; } -int MMV1Storage::AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta) +int MMV1Storage::AddImage(unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta) { return 0; } diff --git a/DeviceAdapters/go2scope/go2scope.h b/DeviceAdapters/go2scope/go2scope.h index 5d99265ed..69f623b94 100644 --- a/DeviceAdapters/go2scope/go2scope.h +++ b/DeviceAdapters/go2scope/go2scope.h @@ -63,8 +63,8 @@ class MMV1Storage : public CStorageBase int Close(const char* handle); int Load(const char* path, const char* name, char* handle); int Delete(char* handle); - int List(const char* path, char** listOfDatasets); - int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta); + int List(const char* path, char** listOfDatasets, int maxItems, int maxItemLength); + int AddImage(unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta); int GetSummaryMeta(const char* handle, char* meta); int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta); const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates); diff --git a/MMCore/Devices/StorageInstance.cpp b/MMCore/Devices/StorageInstance.cpp index 608fd55dc..97b815c17 100644 --- a/MMCore/Devices/StorageInstance.cpp +++ b/MMCore/Devices/StorageInstance.cpp @@ -3,8 +3,7 @@ // // DESCRIPTION: Camera device instance wrapper // -// COPYRIGHT: University of California, San Francisco, 2014, -// Nenad Amodaj 2024 +// COPYRIGHT: Nenad Amodaj 2024 // All Rights reserved // // LICENSE: This file is distributed under the "Lesser GPL" (LGPL) license. @@ -77,14 +76,35 @@ int StorageInstance::Delete(char* handle) int StorageInstance::List(const char* path, std::vector& listOfDatasets) { RequireInitialized(__func__); - char** cList; - // TODO allocate and populate the list - return GetImpl()->List(path, cList); + const int maxItems(5000); + const int maxItemLength(1024); + std::vector cList(maxItems, nullptr); + for (auto c : cList) + { + c = new char[maxItemLength]; + memset(c, 0, maxItemLength); + } + int ret = GetImpl()->List(path, &cList[0], maxItems, maxItemLength); + if (ret == DEVICE_OK) + { + listOfDatasets.clear(); + + for (auto c : cList) + { + if (strlen(c) == 0) break; + listOfDatasets.push_back(std::string(c)); + } + } + + for (auto c : cList) delete[] c; + + return ret; } -int StorageInstance::AddImage(const std::vector& pixels, const std::vector& coordinates, const char* imageMeta) +int StorageInstance::AddImage(std::vector& pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta) { - return 0; + RequireInitialized(__func__); + return GetImpl()->AddImage(&pixels[0], width, height, depth, &coordinates[0], coordinates.size(), imageMeta); } int StorageInstance::GetSummaryMeta(const char* handle, char* meta) diff --git a/MMCore/Devices/StorageInstance.h b/MMCore/Devices/StorageInstance.h index c2ba11921..c785e11c6 100644 --- a/MMCore/Devices/StorageInstance.h +++ b/MMCore/Devices/StorageInstance.h @@ -43,7 +43,7 @@ class StorageInstance : public DeviceInstanceBase int Load(const char* path, const char* name, std::string& handle); int Delete(char* handle); int List(const char* path, std::vector& datasets); - int AddImage(const std::vector& pixels, const std::vector& coordinates, const char* imageMeta); + int AddImage(std::vector& pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta); int GetSummaryMeta(const char* handle, char* meta); int GetImageMeta(const char* handle, const std::vector& coordinates, char* meta); const unsigned char* GetImage(const char* handle, const std::vector& coordinates); diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index 60c7cde03..e8860f466 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7595,7 +7595,9 @@ std::string CMMCore::createDataset(const char* path, const char* name, std::vect logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); } + return handle; } + throw CMMError("No storage device selected."); } std::string CMMCore::getInstalledDeviceDescription(const char* hubLabel, const char* deviceLabel) throw (CMMError) diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index 4126501a4..986246157 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -1405,12 +1405,12 @@ namespace MM { * TODO: exact behavior of this call should be elaborated, including * the format and memory management of the returned list. */ - virtual int List(const char* path, char** listOfDatasets) = 0; + virtual int List(const char* path, char** listOfDatasets, int maxItems, int maxItemLength) = 0; /** * Inserts an image into the dataset */ - virtual int AddImage(unsigned component, int coordinates[], int numCoordinates, const char* imageMeta) = 0; + virtual int AddImage(unsigned char*, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta) = 0; /** * Returns summary metadata From f9c5311907d0a126a1d496fcbbaebe4528d66e8a Mon Sep 17 00:00:00 2001 From: namodaj Date: Mon, 8 Apr 2024 17:15:23 -0700 Subject: [PATCH 07/61] Minimal MMCore interface sketched out --- DeviceAdapters/go2scope/go2scope.cpp | 2 +- DeviceAdapters/go2scope/go2scope.h | 2 +- MMCore/Devices/StorageInstance.cpp | 4 +- MMCore/Devices/StorageInstance.h | 2 +- MMCore/ErrorCodes.h | 1 + MMCore/MMCore.cpp | 110 ++++++++++++++++++++++++++- MMCore/MMCore.h | 4 + MMDevice/MMDevice.h | 2 +- 8 files changed, 119 insertions(+), 8 deletions(-) diff --git a/DeviceAdapters/go2scope/go2scope.cpp b/DeviceAdapters/go2scope/go2scope.cpp index cb6866bd0..fb4c4f49a 100644 --- a/DeviceAdapters/go2scope/go2scope.cpp +++ b/DeviceAdapters/go2scope/go2scope.cpp @@ -153,7 +153,7 @@ int MMV1Storage::List(const char* path, char** listOfDatasets, int maxItems, int return 0; } -int MMV1Storage::AddImage(unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta) +int MMV1Storage::AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta) { return 0; } diff --git a/DeviceAdapters/go2scope/go2scope.h b/DeviceAdapters/go2scope/go2scope.h index 69f623b94..647d3f2a4 100644 --- a/DeviceAdapters/go2scope/go2scope.h +++ b/DeviceAdapters/go2scope/go2scope.h @@ -64,7 +64,7 @@ class MMV1Storage : public CStorageBase int Load(const char* path, const char* name, char* handle); int Delete(char* handle); int List(const char* path, char** listOfDatasets, int maxItems, int maxItemLength); - int AddImage(unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta); + int AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta); int GetSummaryMeta(const char* handle, char* meta); int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta); const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates); diff --git a/MMCore/Devices/StorageInstance.cpp b/MMCore/Devices/StorageInstance.cpp index 97b815c17..8ffd4822d 100644 --- a/MMCore/Devices/StorageInstance.cpp +++ b/MMCore/Devices/StorageInstance.cpp @@ -101,10 +101,10 @@ int StorageInstance::List(const char* path, std::vector& listOfData return ret; } -int StorageInstance::AddImage(std::vector& pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta) +int StorageInstance::AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta) { RequireInitialized(__func__); - return GetImpl()->AddImage(&pixels[0], width, height, depth, &coordinates[0], coordinates.size(), imageMeta); + return GetImpl()->AddImage(handle, pixels, width, height, depth, &coordinates[0], coordinates.size(), imageMeta); } int StorageInstance::GetSummaryMeta(const char* handle, char* meta) diff --git a/MMCore/Devices/StorageInstance.h b/MMCore/Devices/StorageInstance.h index c785e11c6..24d9f6ebd 100644 --- a/MMCore/Devices/StorageInstance.h +++ b/MMCore/Devices/StorageInstance.h @@ -43,7 +43,7 @@ class StorageInstance : public DeviceInstanceBase int Load(const char* path, const char* name, std::string& handle); int Delete(char* handle); int List(const char* path, std::vector& datasets); - int AddImage(std::vector& pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta); + int AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta); int GetSummaryMeta(const char* handle, char* meta); int GetImageMeta(const char* handle, const std::vector& coordinates, char* meta); const unsigned char* GetImage(const char* handle, const std::vector& coordinates); diff --git a/MMCore/ErrorCodes.h b/MMCore/ErrorCodes.h index b63a2e918..5b66d1f39 100644 --- a/MMCore/ErrorCodes.h +++ b/MMCore/ErrorCodes.h @@ -78,4 +78,5 @@ #define MMERR_CreatePeripheralFailed 50 #define MMERR_PropertyNotInCache 51 #define MMERR_BadAffineTransform 52 +#define MMERR_StorageNotAvailable 53 #endif //_ERRORCODES_H_ diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index e8860f466..cf2f23e9d 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7093,6 +7093,7 @@ void CMMCore::InitializeErrorMessages() errorText_[MMERR_NullPointerException] = "Null Pointer Exception."; errorText_[MMERR_CreatePeripheralFailed] = "Hub failed to create specified peripheral device."; errorText_[MMERR_BadAffineTransform] = "Bad affine transform. Affine transforms need to have 6 numbers; 2 rows of 3 column."; + errorText_[MMERR_StorageNotAvailable] = "Storage not loaded or initialized."; } void CMMCore::CreateCoreProperties() @@ -7580,7 +7581,13 @@ std::string CMMCore::getStorageDevice() throw(CMMError) } /** - * Creates a new dataset in the current storage device. + * Create new dataset in the specifed path. Fails if the path already exists. + * + * \param path - parent directory for the dataset + * \param name - name for the dataset + * \param shape - array of max coordinates for each dimension (not counting image x and y) + * \param meta - serialized JSON metadata + * \return - handle for the new dataset */ std::string CMMCore::createDataset(const char* path, const char* name, std::vector shape, const char* meta) { @@ -7597,9 +7604,108 @@ std::string CMMCore::createDataset(const char* path, const char* name, std::vect } return handle; } - throw CMMError("No storage device selected."); + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); } +/** + * Close the currently open dataset to prevent further changes. + * After closing the handle becomes invalid. + * + * \param handle - handle to the open dataset + */ +void CMMCore::acqCloseDataset(const char* handle) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + int ret = storage->Close(handle); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + +/** + * Adds a new image to the dataset. Width, hight and depth define the expected pixel array size. + * Fails if coordinates do not fit into the dataset shape, or if the image dimenions are not supported. + * It can also fail if the underlying implementation does not support the order of image coordinates. + * + * \param handle - handle to the open dataset + * \param pixels - pixel array + * \param width - width of the image + * \param height - height of the image + * \param depth - pixel size in bytes + * \param coordinates - coordinates of the image in the dimension space + * \param imageMeta - serialized JSON with image specific metadata + */ +void CMMCore::acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + int ret = storage->AddImage(handle, pixels, width, height, depth, coordinates, imageMeta); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + +/** + * Configure metadata for a given dimension. + * + * \param handle - handle for the dataset + * \param dimension - dimension index + * \param name - name of the dimension + * \param meaning - Z,T,C, etc. (physical meaning) + */ +void CMMCore::configureDimension(const char* handle, int dimension, const char* name, const char* meaning) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + int ret = storage->ConfigureDimension(handle, dimension, name, meaning); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + +/** + * Configure a particular coordinate name. E.g. channel name or position name. + * + * \param handle - dataset handle + * \param dimension - dimension index + * \param coordinate - coordinate index + * \param name - coordinate name + */ +void CMMCore::configureCoordinate(const char* handle, int dimension, int coordinate, const char* name) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + int ret = storage->ConfigureCoordinate(handle, dimension, coordinate, name); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + std::string CMMCore::getInstalledDeviceDescription(const char* hubLabel, const char* deviceLabel) throw (CMMError) { std::shared_ptr pHub = diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index 47ee66373..33d7cee72 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -632,6 +632,10 @@ class CMMCore /** \name Storage API */ ///@{ std::string createDataset(const char* path, const char* name, std::vector shape, const char* meta); + void acqCloseDataset(const char* handle); + void acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); + void configureDimension(const char* handle, int dimension, const char* name, const char* meaning); + void configureCoordinate(const char* handle, int dimension, int coordinate, const char* name); ///@} private: diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index 986246157..08d499df0 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -1410,7 +1410,7 @@ namespace MM { /** * Inserts an image into the dataset */ - virtual int AddImage(unsigned char*, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta) = 0; + virtual int AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta) = 0; /** * Returns summary metadata From e72c52f4f8695236f64e8a7fd7949d71069c5369 Mon Sep 17 00:00:00 2001 From: namodaj Date: Tue, 23 Apr 2024 13:56:53 -0700 Subject: [PATCH 08/61] loadDataset added --- MMCore/MMCore.cpp | 25 +++++++++++++++++++++++++ MMCore/MMCore.h | 1 + 2 files changed, 26 insertions(+) diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index cf2f23e9d..76077a4c3 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7629,6 +7629,31 @@ void CMMCore::acqCloseDataset(const char* handle) throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); } +/** + * Open an existing dataset in the specifed path. + * + * \param path - parent directory for the dataset + * \param name - name for the dataset + * \return - handle for the opened dataset + */ +std::string CMMCore::loadDataset(const char* path, const char* name) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + std::string handle; + int ret = storage->Load(path, name, handle); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + return handle; + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + /** * Adds a new image to the dataset. Width, hight and depth define the expected pixel array size. * Fails if coordinates do not fit into the dataset shape, or if the image dimenions are not supported. diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index 33d7cee72..ea6adac14 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -633,6 +633,7 @@ class CMMCore ///@{ std::string createDataset(const char* path, const char* name, std::vector shape, const char* meta); void acqCloseDataset(const char* handle); + std::string loadDataset(const char* path, const char* name); void acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); void configureDimension(const char* handle, int dimension, const char* name, const char* meaning); void configureCoordinate(const char* handle, int dimension, int coordinate, const char* name); From fbe7d7bb6b61b719feb23fa95821e2b7409f414f Mon Sep 17 00:00:00 2001 From: namodaj Date: Mon, 29 Apr 2024 19:13:06 -0700 Subject: [PATCH 09/61] vector arguments replaced with vector to help with Swig --- MMCore/MMCore.cpp | 11 +++++++---- MMCore/MMCore.h | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index 76077a4c3..6999c61cc 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7589,14 +7589,16 @@ std::string CMMCore::getStorageDevice() throw(CMMError) * \param meta - serialized JSON metadata * \return - handle for the new dataset */ -std::string CMMCore::createDataset(const char* path, const char* name, std::vector shape, const char* meta) +std::string CMMCore::createDataset(const char* path, const char* name, std::vector shape, const char* meta) { + // NOTE: vector is used instead of vector in the signature because of Swig idiosyncracies std::shared_ptr storage = currentStorage_.lock(); if (storage) { mm::DeviceModuleLockGuard guard(storage); std::string handle; - int ret = storage->Create(path, name, shape, meta, handle); + std::vector intShape(shape.begin(), shape.end()); + int ret = storage->Create(path, name, intShape, meta, handle); if (ret != DEVICE_OK) { logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); @@ -7667,13 +7669,14 @@ std::string CMMCore::loadDataset(const char* path, const char* name) * \param coordinates - coordinates of the image in the dimension space * \param imageMeta - serialized JSON with image specific metadata */ -void CMMCore::acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta) +void CMMCore::acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta) { std::shared_ptr storage = currentStorage_.lock(); if (storage) { mm::DeviceModuleLockGuard guard(storage); - int ret = storage->AddImage(handle, pixels, width, height, depth, coordinates, imageMeta); + std::vector coords(coordinates.begin(), coordinates.end()); + int ret = storage->AddImage(handle, pixels, width, height, depth, coords, imageMeta); if (ret != DEVICE_OK) { logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index ea6adac14..aef2cdc94 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -631,10 +631,10 @@ class CMMCore /** \name Storage API */ ///@{ - std::string createDataset(const char* path, const char* name, std::vector shape, const char* meta); + std::string createDataset(const char* path, const char* name, std::vector shape, const char* meta); void acqCloseDataset(const char* handle); std::string loadDataset(const char* path, const char* name); - void acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); + void acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); void configureDimension(const char* handle, int dimension, const char* name, const char* meaning); void configureCoordinate(const char* handle, int dimension, int coordinate, const char* name); ///@} From 153502efe64a268f8543b2d0eca315e962bc8a9e Mon Sep 17 00:00:00 2001 From: namodaj Date: Mon, 29 Apr 2024 19:41:51 -0700 Subject: [PATCH 10/61] cleaned up API signatures in MMCore --- MMCore/MMCore.cpp | 4 ++-- MMCore/MMCore.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index 6999c61cc..ab01b1319 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7615,7 +7615,7 @@ std::string CMMCore::createDataset(const char* path, const char* name, std::vect * * \param handle - handle to the open dataset */ -void CMMCore::acqCloseDataset(const char* handle) +void CMMCore::closeDataset(const char* handle) { std::shared_ptr storage = currentStorage_.lock(); if (storage) @@ -7669,7 +7669,7 @@ std::string CMMCore::loadDataset(const char* path, const char* name) * \param coordinates - coordinates of the image in the dimension space * \param imageMeta - serialized JSON with image specific metadata */ -void CMMCore::acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta) +void CMMCore::addImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta) { std::shared_ptr storage = currentStorage_.lock(); if (storage) diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index aef2cdc94..9472d5d04 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -632,9 +632,9 @@ class CMMCore /** \name Storage API */ ///@{ std::string createDataset(const char* path, const char* name, std::vector shape, const char* meta); - void acqCloseDataset(const char* handle); + void closeDataset(const char* handle); std::string loadDataset(const char* path, const char* name); - void acqAddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); + void addImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); void configureDimension(const char* handle, int dimension, const char* name, const char* meaning); void configureCoordinate(const char* handle, int dimension, int coordinate, const char* name); ///@} From b75ea01695f972731eb9f1aafdaafaf3953fbf3e Mon Sep 17 00:00:00 2001 From: namodaj Date: Thu, 8 Aug 2024 18:13:27 -0700 Subject: [PATCH 11/61] acquire zarr linked into the device adapter, other dependencies still missing --- DeviceAdapters/go2scope/go2scope.cpp | 8 ++++++-- DeviceAdapters/go2scope/go2scope.h | 2 ++ DeviceAdapters/go2scope/go2scope.vcxproj | 18 ++++++++++-------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/DeviceAdapters/go2scope/go2scope.cpp b/DeviceAdapters/go2scope/go2scope.cpp index fb4c4f49a..71f04023e 100644 --- a/DeviceAdapters/go2scope/go2scope.cpp +++ b/DeviceAdapters/go2scope/go2scope.cpp @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "go2scope.h" #include "ModuleInterface.h" +#include "acquire-zarr.hh" using namespace std; @@ -61,13 +62,15 @@ MODULE_API void DeleteDevice(MM::Device* pDevice) // Lida MMV1Storage::MMV1Storage() : - initialized(false) + initialized(false), zarrWriter(nullptr) { InitializeDefaultErrorMessages(); // set device specific error messages SetErrorText(ERR_INTERNAL, "Internal driver error, see log file for details"); + // create the writer + zarrWriter = new AcquireZarrWriter(); // create pre-initialization properties // ------------------------------------ @@ -82,7 +85,8 @@ MMV1Storage::MMV1Storage() : MMV1Storage::~MMV1Storage() { - Shutdown(); + Shutdown(); + delete zarrWriter; } void MMV1Storage::GetName(char* Name) const diff --git a/DeviceAdapters/go2scope/go2scope.h b/DeviceAdapters/go2scope/go2scope.h index 647d3f2a4..dd3a095aa 100644 --- a/DeviceAdapters/go2scope/go2scope.h +++ b/DeviceAdapters/go2scope/go2scope.h @@ -40,6 +40,7 @@ static const char* g_Go2Scope = "Go2Scope"; static const char* g_MMV1Storage = "MMV1Storage"; +class AcquireZarrWriter; class MMV1Storage : public CStorageBase { @@ -77,5 +78,6 @@ class MMV1Storage : public CStorageBase private: bool initialized; + AcquireZarrWriter* zarrWriter; }; diff --git a/DeviceAdapters/go2scope/go2scope.vcxproj b/DeviceAdapters/go2scope/go2scope.vcxproj index eac8515e1..52733aea2 100644 --- a/DeviceAdapters/go2scope/go2scope.vcxproj +++ b/DeviceAdapters/go2scope/go2scope.vcxproj @@ -61,14 +61,15 @@ 4290;%(DisableSpecificWarnings) - %(AdditionalIncludeDirectories) + $(MM_3RDPARTYPRIVATE)\czi\acquire-zarr\include;%(AdditionalIncludeDirectories) + MultiThreadedDebug Windows - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) + $(MM_3RDPARTYPRIVATE)\CZI\acquire-zarr\$(Configuration)\lib;%(AdditionalLibraryDirectories) + acquire-zarr-cpp.lib;%(AdditionalDependencies) @@ -81,7 +82,8 @@ 4290;%(DisableSpecificWarnings) - %(AdditionalIncludeDirectories) + $(MM_3RDPARTYPRIVATE)\czi\acquire-zarr\include;%(AdditionalIncludeDirectories) + MultiThreaded Windows @@ -89,8 +91,8 @@ true - %(AdditionalLibraryDirectories) - %(AdditionalDependencies) + $(MM_3RDPARTYPRIVATE)\CZI\acquire-zarr\$(Configuration)\lib;%(AdditionalLibraryDirectories) + acquire-zarr-cpp.lib;%(AdditionalDependencies) @@ -100,8 +102,8 @@ - - {b8c95f39-54bf-40a9-807b-598df2821d55} + + {af3143a4-5529-4c78-a01a-9f2a8977ed64} From e5b1a471de720220045130d4d3eff32d00936efa Mon Sep 17 00:00:00 2001 From: namodaj Date: Fri, 16 Aug 2024 10:25:33 -0700 Subject: [PATCH 12/61] static runtime selected --- DeviceAdapters/go2scope/go2scope.vcxproj | 4 ++-- MMCore/MMCore.vcxproj | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/DeviceAdapters/go2scope/go2scope.vcxproj b/DeviceAdapters/go2scope/go2scope.vcxproj index eac8515e1..296b401f7 100644 --- a/DeviceAdapters/go2scope/go2scope.vcxproj +++ b/DeviceAdapters/go2scope/go2scope.vcxproj @@ -100,8 +100,8 @@ - - {b8c95f39-54bf-40a9-807b-598df2821d55} + + {af3143a4-5529-4c78-a01a-9f2a8977ed64} diff --git a/MMCore/MMCore.vcxproj b/MMCore/MMCore.vcxproj index 98b7ce851..412c10feb 100644 --- a/MMCore/MMCore.vcxproj +++ b/MMCore/MMCore.vcxproj @@ -173,11 +173,6 @@ {b8c95f39-54bf-40a9-807b-598df2821d55} - true - true - false - true - false From fcf103bd37a00bc8d525426b97a2e6454b8dae69 Mon Sep 17 00:00:00 2001 From: namodaj Date: Sat, 24 Aug 2024 18:59:10 +0200 Subject: [PATCH 13/61] implementation of data read functions --- DeviceAdapters/go2scope/go2scope.cpp | 10 ++--- DeviceAdapters/go2scope/go2scope.h | 4 +- DeviceAdapters/go2scope/go2scope.vcxproj | 4 +- MMCore/Devices/StorageInstance.cpp | 7 ++-- MMCore/Devices/StorageInstance.h | 4 +- MMCore/MMCore.cpp | 51 ++++++++++++++++++++++++ MMCore/MMCore.h | 4 ++ MMDevice/MMDevice.h | 4 +- MMDevice/MMDeviceConstants.h | 3 ++ 9 files changed, 75 insertions(+), 16 deletions(-) diff --git a/DeviceAdapters/go2scope/go2scope.cpp b/DeviceAdapters/go2scope/go2scope.cpp index 71f04023e..0cf38fd3d 100644 --- a/DeviceAdapters/go2scope/go2scope.cpp +++ b/DeviceAdapters/go2scope/go2scope.cpp @@ -26,7 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// #include "go2scope.h" #include "ModuleInterface.h" -#include "acquire-zarr.hh" +// #include "acquire-zarr.hh" using namespace std; @@ -59,7 +59,7 @@ MODULE_API void DeleteDevice(MM::Device* pDevice) /////////////////////////////////////////////////////////////////////////////// -// Lida +// MMV1Storage MMV1Storage::MMV1Storage() : initialized(false), zarrWriter(nullptr) @@ -70,7 +70,7 @@ MMV1Storage::MMV1Storage() : SetErrorText(ERR_INTERNAL, "Internal driver error, see log file for details"); // create the writer - zarrWriter = new AcquireZarrWriter(); + zarrWriter = nullptr; // create pre-initialization properties // ------------------------------------ @@ -162,12 +162,12 @@ int MMV1Storage::AddImage(const char* handle, unsigned char* pixels, int width, return 0; } -int MMV1Storage::GetSummaryMeta(const char* handle, char* meta) +int MMV1Storage::GetSummaryMeta(const char* handle, char* meta, int bufSize) { return 0; } -int MMV1Storage::GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta) +int MMV1Storage::GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta, int bufSize) { return 0; } diff --git a/DeviceAdapters/go2scope/go2scope.h b/DeviceAdapters/go2scope/go2scope.h index dd3a095aa..6e48698f8 100644 --- a/DeviceAdapters/go2scope/go2scope.h +++ b/DeviceAdapters/go2scope/go2scope.h @@ -66,8 +66,8 @@ class MMV1Storage : public CStorageBase int Delete(char* handle); int List(const char* path, char** listOfDatasets, int maxItems, int maxItemLength); int AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, int coordinates[], int numCoordinates, const char* imageMeta); - int GetSummaryMeta(const char* handle, char* meta); - int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta); + int GetSummaryMeta(const char* handle, char* meta, int bufSize); + int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta, int bufSize); const unsigned char* GetImage(const char* handle, int coordinates[], int numCoordinates); int GetNumberOfDimensions(const char* handle, int& numDimensions); int GetDimension(const char* handle, int dimension, char* name, int nameLength, char* meaning, int meaningLength); diff --git a/DeviceAdapters/go2scope/go2scope.vcxproj b/DeviceAdapters/go2scope/go2scope.vcxproj index 52733aea2..78f503d09 100644 --- a/DeviceAdapters/go2scope/go2scope.vcxproj +++ b/DeviceAdapters/go2scope/go2scope.vcxproj @@ -69,7 +69,7 @@ $(MM_3RDPARTYPRIVATE)\CZI\acquire-zarr\$(Configuration)\lib;%(AdditionalLibraryDirectories) - acquire-zarr-cpp.lib;%(AdditionalDependencies) + acquire-zarr-cpp.lib;acquire-core-logger.lib;acquire-core-platform.lib;acquire-device-hal.lib;acquire-device-properties.lib;acquire-video-runtime.lib;miniocpp-debug.lib;%(AdditionalDependencies) @@ -92,7 +92,7 @@ $(MM_3RDPARTYPRIVATE)\CZI\acquire-zarr\$(Configuration)\lib;%(AdditionalLibraryDirectories) - acquire-zarr-cpp.lib;%(AdditionalDependencies) + acquire-zarr-cpp.lib;acquire-core-logger.lib;acquire-core-platform.lib;acquire-device-hal.lib;acquire-device-properties.lib;acquire-video-runtime.lib;miniocpp-debug.lib;%(AdditionalDependencies) diff --git a/MMCore/Devices/StorageInstance.cpp b/MMCore/Devices/StorageInstance.cpp index 8ffd4822d..6258bc9b6 100644 --- a/MMCore/Devices/StorageInstance.cpp +++ b/MMCore/Devices/StorageInstance.cpp @@ -107,12 +107,13 @@ int StorageInstance::AddImage(const char* handle, unsigned char* pixels, int wid return GetImpl()->AddImage(handle, pixels, width, height, depth, &coordinates[0], coordinates.size(), imageMeta); } -int StorageInstance::GetSummaryMeta(const char* handle, char* meta) +int StorageInstance::GetSummaryMeta(const char* handle, char* meta, int maxSize) { - return 0; + RequireInitialized(__func__); + return GetImpl()->GetSummaryMeta(handle, meta); } -int StorageInstance::GetImageMeta(const char* handle, const std::vector& coordinates, char* meta) +int StorageInstance::GetImageMeta(const char* handle, const std::vector& coordinates, char* meta, int maxSize) { return 0; } diff --git a/MMCore/Devices/StorageInstance.h b/MMCore/Devices/StorageInstance.h index 24d9f6ebd..35dc5ba8b 100644 --- a/MMCore/Devices/StorageInstance.h +++ b/MMCore/Devices/StorageInstance.h @@ -44,8 +44,8 @@ class StorageInstance : public DeviceInstanceBase int Delete(char* handle); int List(const char* path, std::vector& datasets); int AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta); - int GetSummaryMeta(const char* handle, char* meta); - int GetImageMeta(const char* handle, const std::vector& coordinates, char* meta); + int GetSummaryMeta(const char* handle, char* meta, int maxSize); + int GetImageMeta(const char* handle, const std::vector& coordinates, char* meta, int maxSize); const unsigned char* GetImage(const char* handle, const std::vector& coordinates); int GetNumberOfDimensions(const char* handle); int GetDimension(const char* handle, int dimension, std::string& name, std::string& meaning); diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index ab01b1319..fb7242842 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7734,6 +7734,57 @@ void CMMCore::configureCoordinate(const char* handle, int dimension, int coordin throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); } + +std::string CMMCore::getSummaryMeta(const char* handle) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + const int maxMetaSize(100000); + std::vector meta(maxMetaSize); + int ret = storage->GetSummaryMeta(handle, &meta[0], maxMetaSize); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + return std::string(meta.begin(), meta.end()); + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + +std::string CMMCore::getImageMeta(const char* handle, const std::vector& coordinates) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + const int maxMetaSize(100000); + std::vector meta(maxMetaSize); + int ret = storage->GetImageMeta(handle, coordinates, &meta[0], maxMetaSize); + if (ret != DEVICE_OK) + { + logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); + throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); + } + return std::string(meta.begin(), meta.end()); + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + +void* CMMCore::getImage(const char* handle, const std::vector& coordinates) +{ + std::shared_ptr storage = currentStorage_.lock(); + if (storage) + { + mm::DeviceModuleLockGuard guard(storage); + const unsigned char* img = storage->GetImage(handle, coordinates); + return const_cast(img); + } + throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); +} + std::string CMMCore::getInstalledDeviceDescription(const char* hubLabel, const char* deviceLabel) throw (CMMError) { std::shared_ptr pHub = diff --git a/MMCore/MMCore.h b/MMCore/MMCore.h index 9472d5d04..f0081d2ef 100644 --- a/MMCore/MMCore.h +++ b/MMCore/MMCore.h @@ -637,6 +637,10 @@ class CMMCore void addImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector coordinates, const char* imageMeta); void configureDimension(const char* handle, int dimension, const char* name, const char* meaning); void configureCoordinate(const char* handle, int dimension, int coordinate, const char* name); + std::string getSummaryMeta(const char* handle); + std::string getImageMeta(const char* handle, const std::vector& coordinates); + void* getImage(const char* handle, const std::vector& coordinates); + ///@} private: diff --git a/MMDevice/MMDevice.h b/MMDevice/MMDevice.h index 08d499df0..6d7001604 100644 --- a/MMDevice/MMDevice.h +++ b/MMDevice/MMDevice.h @@ -1415,12 +1415,12 @@ namespace MM { /** * Returns summary metadata */ - virtual int GetSummaryMeta(const char* handle, char* meta) = 0; + virtual int GetSummaryMeta(const char* handle, char* meta, int bufSize) = 0; /** * Returns summary metadata */ - virtual int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta) = 0; + virtual int GetImageMeta(const char* handle, int coordinates[], int numCoordinates, char* meta, int bufSize) = 0; /** * Returns image pixels diff --git a/MMDevice/MMDeviceConstants.h b/MMDevice/MMDeviceConstants.h index 5e27bed12..ed9eb90bd 100644 --- a/MMDevice/MMDeviceConstants.h +++ b/MMDevice/MMDeviceConstants.h @@ -83,6 +83,9 @@ namespace MM { // Code filling buffer should assume includes null terminator. const int MaxStrLength = 1024; + // Maximum length of serialized metadata strings + const int MaxMetadataLength = 200000; + // system-wide property names const char* const g_Keyword_Name = "Name"; const char* const g_Keyword_Description = "Description"; From e79e64662d03763aa739158fca2b36de79d0f527 Mon Sep 17 00:00:00 2001 From: namodaj Date: Sun, 25 Aug 2024 19:55:33 +0200 Subject: [PATCH 14/61] storage instance methods populated --- MMCore/Devices/StorageInstance.cpp | 34 ++++++++++++++++++++++-------- MMCore/Devices/StorageInstance.h | 6 +++--- MMCore/MMCore.cpp | 14 ++++++------ 3 files changed, 34 insertions(+), 20 deletions(-) diff --git a/MMCore/Devices/StorageInstance.cpp b/MMCore/Devices/StorageInstance.cpp index 6258bc9b6..02e31cbb8 100644 --- a/MMCore/Devices/StorageInstance.cpp +++ b/MMCore/Devices/StorageInstance.cpp @@ -107,33 +107,49 @@ int StorageInstance::AddImage(const char* handle, unsigned char* pixels, int wid return GetImpl()->AddImage(handle, pixels, width, height, depth, &coordinates[0], coordinates.size(), imageMeta); } -int StorageInstance::GetSummaryMeta(const char* handle, char* meta, int maxSize) +int StorageInstance::GetSummaryMeta(const char* handle, std::string& meta) { RequireInitialized(__func__); - return GetImpl()->GetSummaryMeta(handle, meta); + std::vector metaCharArray(MM::MaxMetadataLength); + int ret = GetImpl()->GetSummaryMeta(handle, &metaCharArray[0], MM::MaxMetadataLength); + meta = std::string(metaCharArray.begin(), metaCharArray.end()); + return ret; } -int StorageInstance::GetImageMeta(const char* handle, const std::vector& coordinates, char* meta, int maxSize) +int StorageInstance::GetImageMeta(const char* handle, const std::vector& coordinates, std::string& meta) { - return 0; + RequireInitialized(__func__); + std::vector metaCharArray(MM::MaxMetadataLength); + int ret = GetImpl()->GetImageMeta(handle, const_cast(&coordinates[0]), coordinates.size(), &metaCharArray[0], MM::MaxMetadataLength); + meta = std::string(metaCharArray.begin(), metaCharArray.end()); + return ret; } const unsigned char* StorageInstance::GetImage(const char* handle, const std::vector& coordinates) { - return nullptr; + RequireInitialized(__func__); + return GetImpl()->GetImage(handle, const_cast(&coordinates[0]), coordinates.size()); } -int StorageInstance::GetNumberOfDimensions(const char* handle) +int StorageInstance::GetNumberOfDimensions(const char* handle, int& numDim) { - return 0; + RequireInitialized(__func__); + return GetImpl()->GetNumberOfDimensions(handle, numDim); } int StorageInstance::GetDimension(const char* handle, int dimension, std::string& name, std::string& meaning) { - return 0; + std::vector nameStr(MM::MaxStrLength), meaningStr(MM::MaxMetadataLength); + int ret = GetImpl()->GetDimension(handle, dimension, &nameStr[0], nameStr.size(), &meaningStr[0], meaningStr.size()); + name = std::string(nameStr.begin(), nameStr.end()); + meaning = std::string(meaningStr.begin(), meaningStr.end()); + return ret; } int StorageInstance::GetCoordinate(const char* handle, int dimension, int coordinate, std::string& name) { - return 0; + std::vector nameStr(MM::MaxStrLength); + int ret = GetImpl()->GetCoordinate(handle, dimension, coordinate, &nameStr[0], nameStr.size()); + name = std::string(nameStr.begin(), nameStr.end()); + return ret; } diff --git a/MMCore/Devices/StorageInstance.h b/MMCore/Devices/StorageInstance.h index 35dc5ba8b..0c53b8825 100644 --- a/MMCore/Devices/StorageInstance.h +++ b/MMCore/Devices/StorageInstance.h @@ -44,10 +44,10 @@ class StorageInstance : public DeviceInstanceBase int Delete(char* handle); int List(const char* path, std::vector& datasets); int AddImage(const char* handle, unsigned char* pixels, int width, int height, int depth, std::vector& coordinates, const char* imageMeta); - int GetSummaryMeta(const char* handle, char* meta, int maxSize); - int GetImageMeta(const char* handle, const std::vector& coordinates, char* meta, int maxSize); + int GetSummaryMeta(const char* handle, std::string& meta); + int GetImageMeta(const char* handle, const std::vector& coordinates, std::string& meta); const unsigned char* GetImage(const char* handle, const std::vector& coordinates); - int GetNumberOfDimensions(const char* handle); + int GetNumberOfDimensions(const char* handle, int& numDimensions); int GetDimension(const char* handle, int dimension, std::string& name, std::string& meaning); int GetCoordinate(const char* handle, int dimension, int coordinate, std::string& name); diff --git a/MMCore/MMCore.cpp b/MMCore/MMCore.cpp index fb7242842..407fccbc7 100644 --- a/MMCore/MMCore.cpp +++ b/MMCore/MMCore.cpp @@ -7741,15 +7741,14 @@ std::string CMMCore::getSummaryMeta(const char* handle) if (storage) { mm::DeviceModuleLockGuard guard(storage); - const int maxMetaSize(100000); - std::vector meta(maxMetaSize); - int ret = storage->GetSummaryMeta(handle, &meta[0], maxMetaSize); + std::string meta; + int ret = storage->GetSummaryMeta(handle, meta); if (ret != DEVICE_OK) { logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); } - return std::string(meta.begin(), meta.end()); + return meta; } throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); } @@ -7760,15 +7759,14 @@ std::string CMMCore::getImageMeta(const char* handle, const std::vector& co if (storage) { mm::DeviceModuleLockGuard guard(storage); - const int maxMetaSize(100000); - std::vector meta(maxMetaSize); - int ret = storage->GetImageMeta(handle, coordinates, &meta[0], maxMetaSize); + std::string meta; + int ret = storage->GetImageMeta(handle, coordinates, meta); if (ret != DEVICE_OK) { logError(getDeviceName(storage).c_str(), getDeviceErrorText(ret, storage).c_str()); throw CMMError(getDeviceErrorText(ret, storage).c_str(), MMERR_DEVICE_GENERIC); } - return std::string(meta.begin(), meta.end()); + return meta; } throw CMMError(getCoreErrorText(MMERR_StorageNotAvailable).c_str(), MMERR_StorageNotAvailable); } From e9fb092c7ab797572478274af095c9d38f6c1913 Mon Sep 17 00:00:00 2001 From: namodaj Date: Wed, 28 Aug 2024 16:20:44 +0200 Subject: [PATCH 15/61] nlohmann json library added --- DeviceAdapters/go2scope/go2scope.cpp | 1 + DeviceAdapters/go2scope/nlohmann/json.hpp | 24765 ++++++++++++++++ DeviceAdapters/go2scope/nlohmann/json_fwd.hpp | 176 + 3 files changed, 24942 insertions(+) create mode 100644 DeviceAdapters/go2scope/nlohmann/json.hpp create mode 100644 DeviceAdapters/go2scope/nlohmann/json_fwd.hpp diff --git a/DeviceAdapters/go2scope/go2scope.cpp b/DeviceAdapters/go2scope/go2scope.cpp index 0cf38fd3d..6ffaf3a8f 100644 --- a/DeviceAdapters/go2scope/go2scope.cpp +++ b/DeviceAdapters/go2scope/go2scope.cpp @@ -27,6 +27,7 @@ #include "go2scope.h" #include "ModuleInterface.h" // #include "acquire-zarr.hh" +#include "nlohmann/json.hpp" using namespace std; diff --git a/DeviceAdapters/go2scope/nlohmann/json.hpp b/DeviceAdapters/go2scope/nlohmann/json.hpp new file mode 100644 index 000000000..8b72ea653 --- /dev/null +++ b/DeviceAdapters/go2scope/nlohmann/json.hpp @@ -0,0 +1,24765 @@ +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + +/****************************************************************************\ + * Note on documentation: The source files contain links to the online * + * documentation of the public API at https://json.nlohmann.me. This URL * + * contains the most recent documentation and should also be applicable to * + * previous versions; documentation for deprecated functions is not * + * removed, but marked deprecated. See "Generate documentation" section in * + * file docs/README.md. * +\****************************************************************************/ + +#ifndef INCLUDE_NLOHMANN_JSON_HPP_ +#define INCLUDE_NLOHMANN_JSON_HPP_ + +#include // all_of, find, for_each +#include // nullptr_t, ptrdiff_t, size_t +#include // hash, less +#include // initializer_list +#ifndef JSON_NO_IO + #include // istream, ostream +#endif // JSON_NO_IO +#include // random_access_iterator_tag +#include // unique_ptr +#include // string, stoi, to_string +#include // declval, forward, move, pair, swap +#include // vector + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// This file contains all macro definitions affecting or depending on the ABI + +#ifndef JSON_SKIP_LIBRARY_VERSION_CHECK + #if defined(NLOHMANN_JSON_VERSION_MAJOR) && defined(NLOHMANN_JSON_VERSION_MINOR) && defined(NLOHMANN_JSON_VERSION_PATCH) + #if NLOHMANN_JSON_VERSION_MAJOR != 3 || NLOHMANN_JSON_VERSION_MINOR != 11 || NLOHMANN_JSON_VERSION_PATCH != 3 + #warning "Already included a different version of the library!" + #endif + #endif +#endif + +#define NLOHMANN_JSON_VERSION_MAJOR 3 // NOLINT(modernize-macro-to-enum) +#define NLOHMANN_JSON_VERSION_MINOR 11 // NOLINT(modernize-macro-to-enum) +#define NLOHMANN_JSON_VERSION_PATCH 3 // NOLINT(modernize-macro-to-enum) + +#ifndef JSON_DIAGNOSTICS + #define JSON_DIAGNOSTICS 0 +#endif + +#ifndef JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON + #define JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON 0 +#endif + +#if JSON_DIAGNOSTICS + #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS _diag +#else + #define NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS +#endif + +#if JSON_USE_LEGACY_DISCARDED_VALUE_COMPARISON + #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON _ldvcmp +#else + #define NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON +#endif + +#ifndef NLOHMANN_JSON_NAMESPACE_NO_VERSION + #define NLOHMANN_JSON_NAMESPACE_NO_VERSION 0 +#endif + +// Construct the namespace ABI tags component +#define NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) json_abi ## a ## b +#define NLOHMANN_JSON_ABI_TAGS_CONCAT(a, b) \ + NLOHMANN_JSON_ABI_TAGS_CONCAT_EX(a, b) + +#define NLOHMANN_JSON_ABI_TAGS \ + NLOHMANN_JSON_ABI_TAGS_CONCAT( \ + NLOHMANN_JSON_ABI_TAG_DIAGNOSTICS, \ + NLOHMANN_JSON_ABI_TAG_LEGACY_DISCARDED_VALUE_COMPARISON) + +// Construct the namespace version component +#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) \ + _v ## major ## _ ## minor ## _ ## patch +#define NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(major, minor, patch) \ + NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT_EX(major, minor, patch) + +#if NLOHMANN_JSON_NAMESPACE_NO_VERSION +#define NLOHMANN_JSON_NAMESPACE_VERSION +#else +#define NLOHMANN_JSON_NAMESPACE_VERSION \ + NLOHMANN_JSON_NAMESPACE_VERSION_CONCAT(NLOHMANN_JSON_VERSION_MAJOR, \ + NLOHMANN_JSON_VERSION_MINOR, \ + NLOHMANN_JSON_VERSION_PATCH) +#endif + +// Combine namespace components +#define NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) a ## b +#define NLOHMANN_JSON_NAMESPACE_CONCAT(a, b) \ + NLOHMANN_JSON_NAMESPACE_CONCAT_EX(a, b) + +#ifndef NLOHMANN_JSON_NAMESPACE +#define NLOHMANN_JSON_NAMESPACE \ + nlohmann::NLOHMANN_JSON_NAMESPACE_CONCAT( \ + NLOHMANN_JSON_ABI_TAGS, \ + NLOHMANN_JSON_NAMESPACE_VERSION) +#endif + +#ifndef NLOHMANN_JSON_NAMESPACE_BEGIN +#define NLOHMANN_JSON_NAMESPACE_BEGIN \ + namespace nlohmann \ + { \ + inline namespace NLOHMANN_JSON_NAMESPACE_CONCAT( \ + NLOHMANN_JSON_ABI_TAGS, \ + NLOHMANN_JSON_NAMESPACE_VERSION) \ + { +#endif + +#ifndef NLOHMANN_JSON_NAMESPACE_END +#define NLOHMANN_JSON_NAMESPACE_END \ + } /* namespace (inline namespace) NOLINT(readability/namespace) */ \ + } // namespace nlohmann +#endif + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // transform +#include // array +#include // forward_list +#include // inserter, front_inserter, end +#include // map +#include // string +#include // tuple, make_tuple +#include // is_arithmetic, is_same, is_enum, underlying_type, is_convertible +#include // unordered_map +#include // pair, declval +#include // valarray + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // nullptr_t +#include // exception +#if JSON_DIAGNOSTICS + #include // accumulate +#endif +#include // runtime_error +#include // to_string +#include // vector + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // array +#include // size_t +#include // uint8_t +#include // string + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // declval, pair +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +template struct make_void +{ + using type = void; +}; +template using void_t = typename make_void::type; + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +// https://en.cppreference.com/w/cpp/experimental/is_detected +struct nonesuch +{ + nonesuch() = delete; + ~nonesuch() = delete; + nonesuch(nonesuch const&) = delete; + nonesuch(nonesuch const&&) = delete; + void operator=(nonesuch const&) = delete; + void operator=(nonesuch&&) = delete; +}; + +template class Op, + class... Args> +struct detector +{ + using value_t = std::false_type; + using type = Default; +}; + +template class Op, class... Args> +struct detector>, Op, Args...> +{ + using value_t = std::true_type; + using type = Op; +}; + +template class Op, class... Args> +using is_detected = typename detector::value_t; + +template class Op, class... Args> +struct is_detected_lazy : is_detected { }; + +template class Op, class... Args> +using detected_t = typename detector::type; + +template class Op, class... Args> +using detected_or = detector; + +template class Op, class... Args> +using detected_or_t = typename detected_or::type; + +template class Op, class... Args> +using is_detected_exact = std::is_same>; + +template class Op, class... Args> +using is_detected_convertible = + std::is_convertible, To>; + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + +// #include + + +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-FileCopyrightText: 2016-2021 Evan Nemerson +// SPDX-License-Identifier: MIT + +/* Hedley - https://nemequ.github.io/hedley + * Created by Evan Nemerson + */ + +#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 15) +#if defined(JSON_HEDLEY_VERSION) + #undef JSON_HEDLEY_VERSION +#endif +#define JSON_HEDLEY_VERSION 15 + +#if defined(JSON_HEDLEY_STRINGIFY_EX) + #undef JSON_HEDLEY_STRINGIFY_EX +#endif +#define JSON_HEDLEY_STRINGIFY_EX(x) #x + +#if defined(JSON_HEDLEY_STRINGIFY) + #undef JSON_HEDLEY_STRINGIFY +#endif +#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x) + +#if defined(JSON_HEDLEY_CONCAT_EX) + #undef JSON_HEDLEY_CONCAT_EX +#endif +#define JSON_HEDLEY_CONCAT_EX(a,b) a##b + +#if defined(JSON_HEDLEY_CONCAT) + #undef JSON_HEDLEY_CONCAT +#endif +#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b) + +#if defined(JSON_HEDLEY_CONCAT3_EX) + #undef JSON_HEDLEY_CONCAT3_EX +#endif +#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c + +#if defined(JSON_HEDLEY_CONCAT3) + #undef JSON_HEDLEY_CONCAT3 +#endif +#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c) + +#if defined(JSON_HEDLEY_VERSION_ENCODE) + #undef JSON_HEDLEY_VERSION_ENCODE +#endif +#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision)) + +#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR) + #undef JSON_HEDLEY_VERSION_DECODE_MAJOR +#endif +#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000) + +#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR) + #undef JSON_HEDLEY_VERSION_DECODE_MINOR +#endif +#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000) + +#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION) + #undef JSON_HEDLEY_VERSION_DECODE_REVISION +#endif +#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000) + +#if defined(JSON_HEDLEY_GNUC_VERSION) + #undef JSON_HEDLEY_GNUC_VERSION +#endif +#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__) + #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__) +#elif defined(__GNUC__) + #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0) +#endif + +#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK) + #undef JSON_HEDLEY_GNUC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_GNUC_VERSION) + #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_MSVC_VERSION) + #undef JSON_HEDLEY_MSVC_VERSION +#endif +#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000) && !defined(__ICL) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100) +#elif defined(_MSC_FULL_VER) && !defined(__ICL) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10) +#elif defined(_MSC_VER) && !defined(__ICL) + #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0) +#endif + +#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK) + #undef JSON_HEDLEY_MSVC_VERSION_CHECK +#endif +#if !defined(JSON_HEDLEY_MSVC_VERSION) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0) +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch))) +#elif defined(_MSC_VER) && (_MSC_VER >= 1200) + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch))) +#else + #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor))) +#endif + +#if defined(JSON_HEDLEY_INTEL_VERSION) + #undef JSON_HEDLEY_INTEL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && !defined(__ICL) + #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE) +#elif defined(__INTEL_COMPILER) && !defined(__ICL) + #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_VERSION) + #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #undef JSON_HEDLEY_INTEL_CL_VERSION +#endif +#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE) && defined(__ICL) + #define JSON_HEDLEY_INTEL_CL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER, __INTEL_COMPILER_UPDATE, 0) +#endif + +#if defined(JSON_HEDLEY_INTEL_CL_VERSION_CHECK) + #undef JSON_HEDLEY_INTEL_CL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_INTEL_CL_VERSION) + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_CL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_INTEL_CL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_PGI_VERSION) + #undef JSON_HEDLEY_PGI_VERSION +#endif +#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__) + #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__) +#endif + +#if defined(JSON_HEDLEY_PGI_VERSION_CHECK) + #undef JSON_HEDLEY_PGI_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_PGI_VERSION) + #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_SUNPRO_VERSION) + #undef JSON_HEDLEY_SUNPRO_VERSION +#endif +#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10) +#elif defined(__SUNPRO_C) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf) +#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10) +#elif defined(__SUNPRO_CC) + #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf) +#endif + +#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK) + #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_SUNPRO_VERSION) + #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) + #undef JSON_HEDLEY_EMSCRIPTEN_VERSION +#endif +#if defined(__EMSCRIPTEN__) + #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__) +#endif + +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK) + #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION) + #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_ARM_VERSION) + #undef JSON_HEDLEY_ARM_VERSION +#endif +#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION) + #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100) +#elif defined(__CC_ARM) && defined(__ARMCC_VERSION) + #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100) +#endif + +#if defined(JSON_HEDLEY_ARM_VERSION_CHECK) + #undef JSON_HEDLEY_ARM_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_ARM_VERSION) + #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_IBM_VERSION) + #undef JSON_HEDLEY_IBM_VERSION +#endif +#if defined(__ibmxl__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__) +#elif defined(__xlC__) && defined(__xlC_ver__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff) +#elif defined(__xlC__) + #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0) +#endif + +#if defined(JSON_HEDLEY_IBM_VERSION_CHECK) + #undef JSON_HEDLEY_IBM_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_IBM_VERSION) + #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_VERSION) + #undef JSON_HEDLEY_TI_VERSION +#endif +#if \ + defined(__TI_COMPILER_VERSION__) && \ + ( \ + defined(__TMS470__) || defined(__TI_ARM__) || \ + defined(__MSP430__) || \ + defined(__TMS320C2000__) \ + ) +#if (__TI_COMPILER_VERSION__ >= 16000000) + #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif +#endif + +#if defined(JSON_HEDLEY_TI_VERSION_CHECK) + #undef JSON_HEDLEY_TI_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_VERSION) + #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL2000_VERSION) + #undef JSON_HEDLEY_TI_CL2000_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__) + #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL2000_VERSION) + #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL430_VERSION) + #undef JSON_HEDLEY_TI_CL430_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__) + #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL430_VERSION) + #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) + #undef JSON_HEDLEY_TI_ARMCL_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__)) + #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK) + #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_ARMCL_VERSION) + #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL6X_VERSION) + #undef JSON_HEDLEY_TI_CL6X_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__) + #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL6X_VERSION) + #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CL7X_VERSION) + #undef JSON_HEDLEY_TI_CL7X_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__) + #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CL7X_VERSION) + #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) + #undef JSON_HEDLEY_TI_CLPRU_VERSION +#endif +#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__) + #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000)) +#endif + +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK) + #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TI_CLPRU_VERSION) + #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_CRAY_VERSION) + #undef JSON_HEDLEY_CRAY_VERSION +#endif +#if defined(_CRAYC) + #if defined(_RELEASE_PATCHLEVEL) + #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL) + #else + #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0) + #endif +#endif + +#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK) + #undef JSON_HEDLEY_CRAY_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_CRAY_VERSION) + #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_IAR_VERSION) + #undef JSON_HEDLEY_IAR_VERSION +#endif +#if defined(__IAR_SYSTEMS_ICC__) + #if __VER__ > 1000 + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000)) + #else + #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(__VER__ / 100, __VER__ % 100, 0) + #endif +#endif + +#if defined(JSON_HEDLEY_IAR_VERSION_CHECK) + #undef JSON_HEDLEY_IAR_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_IAR_VERSION) + #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_TINYC_VERSION) + #undef JSON_HEDLEY_TINYC_VERSION +#endif +#if defined(__TINYC__) + #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100) +#endif + +#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK) + #undef JSON_HEDLEY_TINYC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_TINYC_VERSION) + #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_DMC_VERSION) + #undef JSON_HEDLEY_DMC_VERSION +#endif +#if defined(__DMC__) + #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf) +#endif + +#if defined(JSON_HEDLEY_DMC_VERSION_CHECK) + #undef JSON_HEDLEY_DMC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_DMC_VERSION) + #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_COMPCERT_VERSION) + #undef JSON_HEDLEY_COMPCERT_VERSION +#endif +#if defined(__COMPCERT_VERSION__) + #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100) +#endif + +#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK) + #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_COMPCERT_VERSION) + #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_PELLES_VERSION) + #undef JSON_HEDLEY_PELLES_VERSION +#endif +#if defined(__POCC__) + #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0) +#endif + +#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK) + #undef JSON_HEDLEY_PELLES_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_PELLES_VERSION) + #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #undef JSON_HEDLEY_MCST_LCC_VERSION +#endif +#if defined(__LCC__) && defined(__LCC_MINOR__) + #define JSON_HEDLEY_MCST_LCC_VERSION JSON_HEDLEY_VERSION_ENCODE(__LCC__ / 100, __LCC__ % 100, __LCC_MINOR__) +#endif + +#if defined(JSON_HEDLEY_MCST_LCC_VERSION_CHECK) + #undef JSON_HEDLEY_MCST_LCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_MCST_LCC_VERSION) + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_MCST_LCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_MCST_LCC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_GCC_VERSION) + #undef JSON_HEDLEY_GCC_VERSION +#endif +#if \ + defined(JSON_HEDLEY_GNUC_VERSION) && \ + !defined(__clang__) && \ + !defined(JSON_HEDLEY_INTEL_VERSION) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_ARM_VERSION) && \ + !defined(JSON_HEDLEY_CRAY_VERSION) && \ + !defined(JSON_HEDLEY_TI_VERSION) && \ + !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL430_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \ + !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \ + !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \ + !defined(__COMPCERT__) && \ + !defined(JSON_HEDLEY_MCST_LCC_VERSION) + #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION +#endif + +#if defined(JSON_HEDLEY_GCC_VERSION_CHECK) + #undef JSON_HEDLEY_GCC_VERSION_CHECK +#endif +#if defined(JSON_HEDLEY_GCC_VERSION) + #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch)) +#else + #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0) +#endif + +#if defined(JSON_HEDLEY_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_ATTRIBUTE +#endif +#if \ + defined(__has_attribute) && \ + ( \ + (!defined(JSON_HEDLEY_IAR_VERSION) || JSON_HEDLEY_IAR_VERSION_CHECK(8,5,9)) \ + ) +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute) +#else +# define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE +#endif +#if defined(__has_attribute) + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE +#endif +#if \ + defined(__has_cpp_attribute) && \ + defined(__cplusplus) && \ + (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS) + #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS +#endif +#if !defined(__cplusplus) || !defined(__has_cpp_attribute) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) +#elif \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_IAR_VERSION) && \ + (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \ + (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0)) + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute) +#else + #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE +#endif +#if defined(__has_cpp_attribute) && defined(__cplusplus) + #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE +#endif +#if defined(__has_cpp_attribute) && defined(__cplusplus) + #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_BUILTIN) + #undef JSON_HEDLEY_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin) +#else + #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN) + #undef JSON_HEDLEY_GNUC_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) +#else + #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN) + #undef JSON_HEDLEY_GCC_HAS_BUILTIN +#endif +#if defined(__has_builtin) + #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin) +#else + #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_FEATURE) + #undef JSON_HEDLEY_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature) +#else + #define JSON_HEDLEY_HAS_FEATURE(feature) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE) + #undef JSON_HEDLEY_GNUC_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) +#else + #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_FEATURE) + #undef JSON_HEDLEY_GCC_HAS_FEATURE +#endif +#if defined(__has_feature) + #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature) +#else + #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_EXTENSION) + #undef JSON_HEDLEY_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension) +#else + #define JSON_HEDLEY_HAS_EXTENSION(extension) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION) + #undef JSON_HEDLEY_GNUC_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) +#else + #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION) + #undef JSON_HEDLEY_GCC_HAS_EXTENSION +#endif +#if defined(__has_extension) + #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension) +#else + #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE +#endif +#if defined(__has_declspec_attribute) + #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute) +#else + #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_HAS_WARNING) + #undef JSON_HEDLEY_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning) +#else + #define JSON_HEDLEY_HAS_WARNING(warning) (0) +#endif + +#if defined(JSON_HEDLEY_GNUC_HAS_WARNING) + #undef JSON_HEDLEY_GNUC_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) +#else + #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_GCC_HAS_WARNING) + #undef JSON_HEDLEY_GCC_HAS_WARNING +#endif +#if defined(__has_warning) + #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning) +#else + #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + defined(__clang__) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \ + (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR)) + #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_PRAGMA(value) __pragma(value) +#else + #define JSON_HEDLEY_PRAGMA(value) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH) + #undef JSON_HEDLEY_DIAGNOSTIC_PUSH +#endif +#if defined(JSON_HEDLEY_DIAGNOSTIC_POP) + #undef JSON_HEDLEY_DIAGNOSTIC_POP +#endif +#if defined(__clang__) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push)) + #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop)) +#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)") + #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_PUSH + #define JSON_HEDLEY_DIAGNOSTIC_POP +#endif + +/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for + HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ +#endif +#if defined(__cplusplus) +# if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat") +# if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions") +# if JSON_HEDLEY_HAS_WARNING("-Wc++1z-extensions") +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + _Pragma("clang diagnostic ignored \"-Wc++1z-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# endif +# else +# define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \ + xpr \ + JSON_HEDLEY_DIAGNOSTIC_POP +# endif +# endif +#endif +#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x +#endif + +#if defined(JSON_HEDLEY_CONST_CAST) + #undef JSON_HEDLEY_CONST_CAST +#endif +#if defined(__cplusplus) +# define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast(expr)) +#elif \ + JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \ + ((T) (expr)); \ + JSON_HEDLEY_DIAGNOSTIC_POP \ + })) +#else +# define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_REINTERPRET_CAST) + #undef JSON_HEDLEY_REINTERPRET_CAST +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast(expr)) +#else + #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_STATIC_CAST) + #undef JSON_HEDLEY_STATIC_CAST +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast(expr)) +#else + #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr)) +#endif + +#if defined(JSON_HEDLEY_CPP_CAST) + #undef JSON_HEDLEY_CPP_CAST +#endif +#if defined(__cplusplus) +# if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast") +# define JSON_HEDLEY_CPP_CAST(T, expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \ + ((T) (expr)) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0) +# define JSON_HEDLEY_CPP_CAST(T, expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("diag_suppress=Pe137") \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr)) +# endif +#else +# define JSON_HEDLEY_CPP_CAST(T, expr) (expr) +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:1478 1786)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1216,1444,1445") +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215") +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:161)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068)) +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 161") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)") +#elif JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:1292)) +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030)) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(20,7,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097,1098") +#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)") +#elif \ + JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097") +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"") +#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL +#endif + +#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION) + #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunused-function") + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("clang diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("GCC diagnostic ignored \"-Wunused-function\"") +#elif JSON_HEDLEY_MSVC_VERSION_CHECK(1,0,0) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION __pragma(warning(disable:4505)) +#elif JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION _Pragma("diag_suppress 3142") +#else + #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNUSED_FUNCTION +#endif + +#if defined(JSON_HEDLEY_DEPRECATED) + #undef JSON_HEDLEY_DEPRECATED +#endif +#if defined(JSON_HEDLEY_DEPRECATED_FOR) + #undef JSON_HEDLEY_DEPRECATED_FOR +#endif +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since)) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement)) +#elif \ + (JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since))) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement))) +#elif defined(__cplusplus) && (__cplusplus >= 201402L) + #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]]) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]]) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) + #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__)) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated) +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated") + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated") +#else + #define JSON_HEDLEY_DEPRECATED(since) + #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) +#endif + +#if defined(JSON_HEDLEY_UNAVAILABLE) + #undef JSON_HEDLEY_UNAVAILABLE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since))) +#else + #define JSON_HEDLEY_UNAVAILABLE(available_since) +#endif + +#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT) + #undef JSON_HEDLEY_WARN_UNUSED_RESULT +#endif +#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG) + #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__)) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__)) +#elif (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) + #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]]) +#elif defined(_Check_return_) /* SAL */ + #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_ + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_ +#else + #define JSON_HEDLEY_WARN_UNUSED_RESULT + #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) +#endif + +#if defined(JSON_HEDLEY_SENTINEL) + #undef JSON_HEDLEY_SENTINEL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position))) +#else + #define JSON_HEDLEY_SENTINEL(position) +#endif + +#if defined(JSON_HEDLEY_NO_RETURN) + #undef JSON_HEDLEY_NO_RETURN +#endif +#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_NO_RETURN __noreturn +#elif \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L + #define JSON_HEDLEY_NO_RETURN _Noreturn +#elif defined(__cplusplus) && (__cplusplus >= 201103L) + #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]]) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) + #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) + #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;") +#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) + #define JSON_HEDLEY_NO_RETURN __attribute((noreturn)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) + #define JSON_HEDLEY_NO_RETURN __declspec(noreturn) +#else + #define JSON_HEDLEY_NO_RETURN +#endif + +#if defined(JSON_HEDLEY_NO_ESCAPE) + #undef JSON_HEDLEY_NO_ESCAPE +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape) + #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__)) +#else + #define JSON_HEDLEY_NO_ESCAPE +#endif + +#if defined(JSON_HEDLEY_UNREACHABLE) + #undef JSON_HEDLEY_UNREACHABLE +#endif +#if defined(JSON_HEDLEY_UNREACHABLE_RETURN) + #undef JSON_HEDLEY_UNREACHABLE_RETURN +#endif +#if defined(JSON_HEDLEY_ASSUME) + #undef JSON_HEDLEY_ASSUME +#endif +#if \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_ASSUME(expr) __assume(expr) +#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume) + #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr) +#elif \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) + #if defined(__cplusplus) + #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr) + #else + #define JSON_HEDLEY_ASSUME(expr) _nassert(expr) + #endif +#endif +#if \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(10,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable() +#elif defined(JSON_HEDLEY_ASSUME) + #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) +#endif +#if !defined(JSON_HEDLEY_ASSUME) + #if defined(JSON_HEDLEY_UNREACHABLE) + #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1))) + #else + #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr) + #endif +#endif +#if defined(JSON_HEDLEY_UNREACHABLE) + #if \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value)) + #else + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE() + #endif +#else + #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value) +#endif +#if !defined(JSON_HEDLEY_UNREACHABLE) + #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0) +#endif + +JSON_HEDLEY_DIAGNOSTIC_PUSH +#if JSON_HEDLEY_HAS_WARNING("-Wpedantic") + #pragma clang diagnostic ignored "-Wpedantic" +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus) + #pragma clang diagnostic ignored "-Wc++98-compat-pedantic" +#endif +#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0) + #if defined(__clang__) + #pragma clang diagnostic ignored "-Wvariadic-macros" + #elif defined(JSON_HEDLEY_GCC_VERSION) + #pragma GCC diagnostic ignored "-Wvariadic-macros" + #endif +#endif +#if defined(JSON_HEDLEY_NON_NULL) + #undef JSON_HEDLEY_NON_NULL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) + #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__))) +#else + #define JSON_HEDLEY_NON_NULL(...) +#endif +JSON_HEDLEY_DIAGNOSTIC_POP + +#if defined(JSON_HEDLEY_PRINTF_FORMAT) + #undef JSON_HEDLEY_PRINTF_FORMAT +#endif +#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check))) +#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check))) +#elif \ + JSON_HEDLEY_HAS_ATTRIBUTE(format) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check))) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0) + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check)) +#else + #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) +#endif + +#if defined(JSON_HEDLEY_CONSTEXPR) + #undef JSON_HEDLEY_CONSTEXPR +#endif +#if defined(__cplusplus) + #if __cplusplus >= 201103L + #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr) + #endif +#endif +#if !defined(JSON_HEDLEY_CONSTEXPR) + #define JSON_HEDLEY_CONSTEXPR +#endif + +#if defined(JSON_HEDLEY_PREDICT) + #undef JSON_HEDLEY_PREDICT +#endif +#if defined(JSON_HEDLEY_LIKELY) + #undef JSON_HEDLEY_LIKELY +#endif +#if defined(JSON_HEDLEY_UNLIKELY) + #undef JSON_HEDLEY_UNLIKELY +#endif +#if defined(JSON_HEDLEY_UNPREDICTABLE) + #undef JSON_HEDLEY_UNPREDICTABLE +#endif +#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable) + #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr)) +#endif +#if \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) && !defined(JSON_HEDLEY_PGI_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability( (expr), (value), (probability)) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1 , (probability)) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0 , (probability)) +# define JSON_HEDLEY_LIKELY(expr) __builtin_expect (!!(expr), 1 ) +# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect (!!(expr), 0 ) +#elif \ + (JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PREDICT(expr, expected, probability) \ + (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \ + (__extension__ ({ \ + double hedley_probability_ = (probability); \ + ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \ + })) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \ + (__extension__ ({ \ + double hedley_probability_ = (probability); \ + ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \ + })) +# define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1) +# define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0) +#else +# define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)) +# define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr)) +# define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr)) +# define JSON_HEDLEY_LIKELY(expr) (!!(expr)) +# define JSON_HEDLEY_UNLIKELY(expr) (!!(expr)) +#endif +#if !defined(JSON_HEDLEY_UNPREDICTABLE) + #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5) +#endif + +#if defined(JSON_HEDLEY_MALLOC) + #undef JSON_HEDLEY_MALLOC +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_MALLOC __attribute__((__malloc__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory") +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_MALLOC __declspec(restrict) +#else + #define JSON_HEDLEY_MALLOC +#endif + +#if defined(JSON_HEDLEY_PURE) + #undef JSON_HEDLEY_PURE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PURE __attribute__((__pure__)) +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) +# define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data") +#elif defined(__cplusplus) && \ + ( \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \ + ) +# define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;") +#else +# define JSON_HEDLEY_PURE +#endif + +#if defined(JSON_HEDLEY_CONST) + #undef JSON_HEDLEY_CONST +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(const) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_CONST __attribute__((__const__)) +#elif \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) + #define JSON_HEDLEY_CONST _Pragma("no_side_effect") +#else + #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE +#endif + +#if defined(JSON_HEDLEY_RESTRICT) + #undef JSON_HEDLEY_RESTRICT +#endif +#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus) + #define JSON_HEDLEY_RESTRICT restrict +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \ + defined(__clang__) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_RESTRICT __restrict +#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus) + #define JSON_HEDLEY_RESTRICT _Restrict +#else + #define JSON_HEDLEY_RESTRICT +#endif + +#if defined(JSON_HEDLEY_INLINE) + #undef JSON_HEDLEY_INLINE +#endif +#if \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \ + (defined(__cplusplus) && (__cplusplus >= 199711L)) + #define JSON_HEDLEY_INLINE inline +#elif \ + defined(JSON_HEDLEY_GCC_VERSION) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0) + #define JSON_HEDLEY_INLINE __inline__ +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_INLINE __inline +#else + #define JSON_HEDLEY_INLINE +#endif + +#if defined(JSON_HEDLEY_ALWAYS_INLINE) + #undef JSON_HEDLEY_ALWAYS_INLINE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) +# define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) +# define JSON_HEDLEY_ALWAYS_INLINE __forceinline +#elif defined(__cplusplus) && \ + ( \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \ + ) +# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) +# define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced") +#else +# define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE +#endif + +#if defined(JSON_HEDLEY_NEVER_INLINE) + #undef JSON_HEDLEY_NEVER_INLINE +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \ + JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \ + (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \ + (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \ + (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \ + JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \ + JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) || \ + JSON_HEDLEY_IAR_VERSION_CHECK(8,10,0) + #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) +#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline") +#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;") +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) + #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never") +#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0) + #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0) + #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline) +#else + #define JSON_HEDLEY_NEVER_INLINE +#endif + +#if defined(JSON_HEDLEY_PRIVATE) + #undef JSON_HEDLEY_PRIVATE +#endif +#if defined(JSON_HEDLEY_PUBLIC) + #undef JSON_HEDLEY_PUBLIC +#endif +#if defined(JSON_HEDLEY_IMPORT) + #undef JSON_HEDLEY_IMPORT +#endif +#if defined(_WIN32) || defined(__CYGWIN__) +# define JSON_HEDLEY_PRIVATE +# define JSON_HEDLEY_PUBLIC __declspec(dllexport) +# define JSON_HEDLEY_IMPORT __declspec(dllimport) +#else +# if \ + JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + ( \ + defined(__TI_EABI__) && \ + ( \ + (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \ + ) \ + ) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) +# define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden"))) +# define JSON_HEDLEY_PUBLIC __attribute__((__visibility__("default"))) +# else +# define JSON_HEDLEY_PRIVATE +# define JSON_HEDLEY_PUBLIC +# endif +# define JSON_HEDLEY_IMPORT extern +#endif + +#if defined(JSON_HEDLEY_NO_THROW) + #undef JSON_HEDLEY_NO_THROW +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__)) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) + #define JSON_HEDLEY_NO_THROW __declspec(nothrow) +#else + #define JSON_HEDLEY_NO_THROW +#endif + +#if defined(JSON_HEDLEY_FALL_THROUGH) + #undef JSON_HEDLEY_FALL_THROUGH +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__)) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough) + #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]]) +#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough) + #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]]) +#elif defined(__fallthrough) /* SAL */ + #define JSON_HEDLEY_FALL_THROUGH __fallthrough +#else + #define JSON_HEDLEY_FALL_THROUGH +#endif + +#if defined(JSON_HEDLEY_RETURNS_NON_NULL) + #undef JSON_HEDLEY_RETURNS_NON_NULL +#endif +#if \ + JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__)) +#elif defined(_Ret_notnull_) /* SAL */ + #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_ +#else + #define JSON_HEDLEY_RETURNS_NON_NULL +#endif + +#if defined(JSON_HEDLEY_ARRAY_PARAM) + #undef JSON_HEDLEY_ARRAY_PARAM +#endif +#if \ + defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \ + !defined(__STDC_NO_VLA__) && \ + !defined(__cplusplus) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_TINYC_VERSION) + #define JSON_HEDLEY_ARRAY_PARAM(name) (name) +#else + #define JSON_HEDLEY_ARRAY_PARAM(name) +#endif + +#if defined(JSON_HEDLEY_IS_CONSTANT) + #undef JSON_HEDLEY_IS_CONSTANT +#endif +#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR) + #undef JSON_HEDLEY_REQUIRE_CONSTEXPR +#endif +/* JSON_HEDLEY_IS_CONSTEXPR_ is for + HEDLEY INTERNAL USE ONLY. API subject to change without notice. */ +#if defined(JSON_HEDLEY_IS_CONSTEXPR_) + #undef JSON_HEDLEY_IS_CONSTEXPR_ +#endif +#if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \ + (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_MCST_LCC_VERSION_CHECK(1,25,10) + #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr) +#endif +#if !defined(__cplusplus) +# if \ + JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \ + JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \ + JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24) +#if defined(__INTPTR_TYPE__) + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*) +#else + #include + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*) +#endif +# elif \ + ( \ + defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \ + !defined(JSON_HEDLEY_SUNPRO_VERSION) && \ + !defined(JSON_HEDLEY_PGI_VERSION) && \ + !defined(JSON_HEDLEY_IAR_VERSION)) || \ + (JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) && !defined(JSON_HEDLEY_IAR_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \ + JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \ + JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0) +#if defined(__INTPTR_TYPE__) + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0) +#else + #include + #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0) +#endif +# elif \ + defined(JSON_HEDLEY_GCC_VERSION) || \ + defined(JSON_HEDLEY_INTEL_VERSION) || \ + defined(JSON_HEDLEY_TINYC_VERSION) || \ + defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \ + JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \ + defined(JSON_HEDLEY_TI_CL2000_VERSION) || \ + defined(JSON_HEDLEY_TI_CL6X_VERSION) || \ + defined(JSON_HEDLEY_TI_CL7X_VERSION) || \ + defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \ + defined(__clang__) +# define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \ + sizeof(void) != \ + sizeof(*( \ + 1 ? \ + ((void*) ((expr) * 0L) ) : \ +((struct { char v[sizeof(void) * 2]; } *) 1) \ + ) \ + ) \ + ) +# endif +#endif +#if defined(JSON_HEDLEY_IS_CONSTEXPR_) + #if !defined(JSON_HEDLEY_IS_CONSTANT) + #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr) + #endif + #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1)) +#else + #if !defined(JSON_HEDLEY_IS_CONSTANT) + #define JSON_HEDLEY_IS_CONSTANT(expr) (0) + #endif + #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr) +#endif + +#if defined(JSON_HEDLEY_BEGIN_C_DECLS) + #undef JSON_HEDLEY_BEGIN_C_DECLS +#endif +#if defined(JSON_HEDLEY_END_C_DECLS) + #undef JSON_HEDLEY_END_C_DECLS +#endif +#if defined(JSON_HEDLEY_C_DECL) + #undef JSON_HEDLEY_C_DECL +#endif +#if defined(__cplusplus) + #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" { + #define JSON_HEDLEY_END_C_DECLS } + #define JSON_HEDLEY_C_DECL extern "C" +#else + #define JSON_HEDLEY_BEGIN_C_DECLS + #define JSON_HEDLEY_END_C_DECLS + #define JSON_HEDLEY_C_DECL +#endif + +#if defined(JSON_HEDLEY_STATIC_ASSERT) + #undef JSON_HEDLEY_STATIC_ASSERT +#endif +#if \ + !defined(__cplusplus) && ( \ + (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \ + (JSON_HEDLEY_HAS_FEATURE(c_static_assert) && !defined(JSON_HEDLEY_INTEL_CL_VERSION)) || \ + JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \ + defined(_Static_assert) \ + ) +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message) +#elif \ + (defined(__cplusplus) && (__cplusplus >= 201103L)) || \ + JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message)) +#else +# define JSON_HEDLEY_STATIC_ASSERT(expr, message) +#endif + +#if defined(JSON_HEDLEY_NULL) + #undef JSON_HEDLEY_NULL +#endif +#if defined(__cplusplus) + #if __cplusplus >= 201103L + #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr) + #elif defined(NULL) + #define JSON_HEDLEY_NULL NULL + #else + #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0) + #endif +#elif defined(NULL) + #define JSON_HEDLEY_NULL NULL +#else + #define JSON_HEDLEY_NULL ((void*) 0) +#endif + +#if defined(JSON_HEDLEY_MESSAGE) + #undef JSON_HEDLEY_MESSAGE +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") +# define JSON_HEDLEY_MESSAGE(msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ + JSON_HEDLEY_PRAGMA(message msg) \ + JSON_HEDLEY_DIAGNOSTIC_POP +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg) +#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg) +#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0) +# define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#else +# define JSON_HEDLEY_MESSAGE(msg) +#endif + +#if defined(JSON_HEDLEY_WARNING) + #undef JSON_HEDLEY_WARNING +#endif +#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas") +# define JSON_HEDLEY_WARNING(msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \ + JSON_HEDLEY_PRAGMA(clang warning msg) \ + JSON_HEDLEY_DIAGNOSTIC_POP +#elif \ + JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \ + JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \ + JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg) +#elif \ + JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg)) +#else +# define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg) +#endif + +#if defined(JSON_HEDLEY_REQUIRE) + #undef JSON_HEDLEY_REQUIRE +#endif +#if defined(JSON_HEDLEY_REQUIRE_MSG) + #undef JSON_HEDLEY_REQUIRE_MSG +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if) +# if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat") +# define JSON_HEDLEY_REQUIRE(expr) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ + __attribute__((diagnose_if(!(expr), #expr, "error"))) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \ + __attribute__((diagnose_if(!(expr), msg, "error"))) \ + JSON_HEDLEY_DIAGNOSTIC_POP +# else +# define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error"))) +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error"))) +# endif +#else +# define JSON_HEDLEY_REQUIRE(expr) +# define JSON_HEDLEY_REQUIRE_MSG(expr,msg) +#endif + +#if defined(JSON_HEDLEY_FLAGS) + #undef JSON_HEDLEY_FLAGS +#endif +#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum) && (!defined(__cplusplus) || JSON_HEDLEY_HAS_WARNING("-Wbitfield-enum-conversion")) + #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__)) +#else + #define JSON_HEDLEY_FLAGS +#endif + +#if defined(JSON_HEDLEY_FLAGS_CAST) + #undef JSON_HEDLEY_FLAGS_CAST +#endif +#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0) +# define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \ + JSON_HEDLEY_DIAGNOSTIC_PUSH \ + _Pragma("warning(disable:188)") \ + ((T) (expr)); \ + JSON_HEDLEY_DIAGNOSTIC_POP \ + })) +#else +# define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr) +#endif + +#if defined(JSON_HEDLEY_EMPTY_BASES) + #undef JSON_HEDLEY_EMPTY_BASES +#endif +#if \ + (JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)) || \ + JSON_HEDLEY_INTEL_CL_VERSION_CHECK(2021,1,0) + #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases) +#else + #define JSON_HEDLEY_EMPTY_BASES +#endif + +/* Remaining macros are deprecated. */ + +#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK) + #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK +#endif +#if defined(__clang__) + #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0) +#else + #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) +#endif + +#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN) + #undef JSON_HEDLEY_CLANG_HAS_BUILTIN +#endif +#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin) + +#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE) + #undef JSON_HEDLEY_CLANG_HAS_FEATURE +#endif +#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature) + +#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION) + #undef JSON_HEDLEY_CLANG_HAS_EXTENSION +#endif +#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension) + +#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE) + #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE +#endif +#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) + +#if defined(JSON_HEDLEY_CLANG_HAS_WARNING) + #undef JSON_HEDLEY_CLANG_HAS_WARNING +#endif +#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning) + +#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */ + + +// This file contains all internal macro definitions (except those affecting ABI) +// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them + +// #include + + +// exclude unsupported compilers +#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK) + #if defined(__clang__) + #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400 + #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" + #endif + #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER)) + #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800 + #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" + #endif + #endif +#endif + +// C++ language standard detection +// if the user manually specified the used c++ version this is skipped +#if !defined(JSON_HAS_CPP_20) && !defined(JSON_HAS_CPP_17) && !defined(JSON_HAS_CPP_14) && !defined(JSON_HAS_CPP_11) + #if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L) + #define JSON_HAS_CPP_20 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464 + #define JSON_HAS_CPP_17 + #define JSON_HAS_CPP_14 + #elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1) + #define JSON_HAS_CPP_14 + #endif + // the cpp 11 flag is always specified because it is the minimal required version + #define JSON_HAS_CPP_11 +#endif + +#ifdef __has_include + #if __has_include() + #include + #endif +#endif + +#if !defined(JSON_HAS_FILESYSTEM) && !defined(JSON_HAS_EXPERIMENTAL_FILESYSTEM) + #ifdef JSON_HAS_CPP_17 + #if defined(__cpp_lib_filesystem) + #define JSON_HAS_FILESYSTEM 1 + #elif defined(__cpp_lib_experimental_filesystem) + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #elif !defined(__has_include) + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #elif __has_include() + #define JSON_HAS_FILESYSTEM 1 + #elif __has_include() + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 1 + #endif + + // std::filesystem does not work on MinGW GCC 8: https://sourceforge.net/p/mingw-w64/bugs/737/ + #if defined(__MINGW32__) && defined(__GNUC__) && __GNUC__ == 8 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before GCC 8: https://en.cppreference.com/w/cpp/compiler_support + #if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 8 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before Clang 7: https://en.cppreference.com/w/cpp/compiler_support + #if defined(__clang_major__) && __clang_major__ < 7 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before MSVC 19.14: https://en.cppreference.com/w/cpp/compiler_support + #if defined(_MSC_VER) && _MSC_VER < 1914 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before iOS 13 + #if defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130000 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + + // no filesystem support before macOS Catalina + #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500 + #undef JSON_HAS_FILESYSTEM + #undef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #endif + #endif +#endif + +#ifndef JSON_HAS_EXPERIMENTAL_FILESYSTEM + #define JSON_HAS_EXPERIMENTAL_FILESYSTEM 0 +#endif + +#ifndef JSON_HAS_FILESYSTEM + #define JSON_HAS_FILESYSTEM 0 +#endif + +#ifndef JSON_HAS_THREE_WAY_COMPARISON + #if defined(__cpp_impl_three_way_comparison) && __cpp_impl_three_way_comparison >= 201907L \ + && defined(__cpp_lib_three_way_comparison) && __cpp_lib_three_way_comparison >= 201907L + #define JSON_HAS_THREE_WAY_COMPARISON 1 + #else + #define JSON_HAS_THREE_WAY_COMPARISON 0 + #endif +#endif + +#ifndef JSON_HAS_RANGES + // ranges header shipping in GCC 11.1.0 (released 2021-04-27) has syntax error + #if defined(__GLIBCXX__) && __GLIBCXX__ == 20210427 + #define JSON_HAS_RANGES 0 + #elif defined(__cpp_lib_ranges) + #define JSON_HAS_RANGES 1 + #else + #define JSON_HAS_RANGES 0 + #endif +#endif + +#ifndef JSON_HAS_STATIC_RTTI + #if !defined(_HAS_STATIC_RTTI) || _HAS_STATIC_RTTI != 0 + #define JSON_HAS_STATIC_RTTI 1 + #else + #define JSON_HAS_STATIC_RTTI 0 + #endif +#endif + +#ifdef JSON_HAS_CPP_17 + #define JSON_INLINE_VARIABLE inline +#else + #define JSON_INLINE_VARIABLE +#endif + +#if JSON_HEDLEY_HAS_ATTRIBUTE(no_unique_address) + #define JSON_NO_UNIQUE_ADDRESS [[no_unique_address]] +#else + #define JSON_NO_UNIQUE_ADDRESS +#endif + +// disable documentation warnings on clang +#if defined(__clang__) + #pragma clang diagnostic push + #pragma clang diagnostic ignored "-Wdocumentation" + #pragma clang diagnostic ignored "-Wdocumentation-unknown-command" +#endif + +// allow disabling exceptions +#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION) + #define JSON_THROW(exception) throw exception + #define JSON_TRY try + #define JSON_CATCH(exception) catch(exception) + #define JSON_INTERNAL_CATCH(exception) catch(exception) +#else + #include + #define JSON_THROW(exception) std::abort() + #define JSON_TRY if(true) + #define JSON_CATCH(exception) if(false) + #define JSON_INTERNAL_CATCH(exception) if(false) +#endif + +// override exception macros +#if defined(JSON_THROW_USER) + #undef JSON_THROW + #define JSON_THROW JSON_THROW_USER +#endif +#if defined(JSON_TRY_USER) + #undef JSON_TRY + #define JSON_TRY JSON_TRY_USER +#endif +#if defined(JSON_CATCH_USER) + #undef JSON_CATCH + #define JSON_CATCH JSON_CATCH_USER + #undef JSON_INTERNAL_CATCH + #define JSON_INTERNAL_CATCH JSON_CATCH_USER +#endif +#if defined(JSON_INTERNAL_CATCH_USER) + #undef JSON_INTERNAL_CATCH + #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER +#endif + +// allow overriding assert +#if !defined(JSON_ASSERT) + #include // assert + #define JSON_ASSERT(x) assert(x) +#endif + +// allow to access some private functions (needed by the test suite) +#if defined(JSON_TESTS_PRIVATE) + #define JSON_PRIVATE_UNLESS_TESTED public +#else + #define JSON_PRIVATE_UNLESS_TESTED private +#endif + +/*! +@brief macro to briefly define a mapping between an enum and JSON +@def NLOHMANN_JSON_SERIALIZE_ENUM +@since version 3.4.0 +*/ +#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...) \ + template \ + inline void to_json(BasicJsonType& j, const ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ + [e](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.first == e; \ + }); \ + j = ((it != std::end(m)) ? it : std::begin(m))->second; \ + } \ + template \ + inline void from_json(const BasicJsonType& j, ENUM_TYPE& e) \ + { \ + static_assert(std::is_enum::value, #ENUM_TYPE " must be an enum!"); \ + static const std::pair m[] = __VA_ARGS__; \ + auto it = std::find_if(std::begin(m), std::end(m), \ + [&j](const std::pair& ej_pair) -> bool \ + { \ + return ej_pair.second == j; \ + }); \ + e = ((it != std::end(m)) ? it : std::begin(m))->first; \ + } + +// Ugly macros to avoid uglier copy-paste when specializing basic_json. They +// may be removed in the future once the class is split. + +#define NLOHMANN_BASIC_JSON_TPL_DECLARATION \ + template class ObjectType, \ + template class ArrayType, \ + class StringType, class BooleanType, class NumberIntegerType, \ + class NumberUnsignedType, class NumberFloatType, \ + template class AllocatorType, \ + template class JSONSerializer, \ + class BinaryType, \ + class CustomBaseClass> + +#define NLOHMANN_BASIC_JSON_TPL \ + basic_json + +// Macros to simplify conversion from/to types + +#define NLOHMANN_JSON_EXPAND( x ) x +#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME +#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \ + NLOHMANN_JSON_PASTE64, \ + NLOHMANN_JSON_PASTE63, \ + NLOHMANN_JSON_PASTE62, \ + NLOHMANN_JSON_PASTE61, \ + NLOHMANN_JSON_PASTE60, \ + NLOHMANN_JSON_PASTE59, \ + NLOHMANN_JSON_PASTE58, \ + NLOHMANN_JSON_PASTE57, \ + NLOHMANN_JSON_PASTE56, \ + NLOHMANN_JSON_PASTE55, \ + NLOHMANN_JSON_PASTE54, \ + NLOHMANN_JSON_PASTE53, \ + NLOHMANN_JSON_PASTE52, \ + NLOHMANN_JSON_PASTE51, \ + NLOHMANN_JSON_PASTE50, \ + NLOHMANN_JSON_PASTE49, \ + NLOHMANN_JSON_PASTE48, \ + NLOHMANN_JSON_PASTE47, \ + NLOHMANN_JSON_PASTE46, \ + NLOHMANN_JSON_PASTE45, \ + NLOHMANN_JSON_PASTE44, \ + NLOHMANN_JSON_PASTE43, \ + NLOHMANN_JSON_PASTE42, \ + NLOHMANN_JSON_PASTE41, \ + NLOHMANN_JSON_PASTE40, \ + NLOHMANN_JSON_PASTE39, \ + NLOHMANN_JSON_PASTE38, \ + NLOHMANN_JSON_PASTE37, \ + NLOHMANN_JSON_PASTE36, \ + NLOHMANN_JSON_PASTE35, \ + NLOHMANN_JSON_PASTE34, \ + NLOHMANN_JSON_PASTE33, \ + NLOHMANN_JSON_PASTE32, \ + NLOHMANN_JSON_PASTE31, \ + NLOHMANN_JSON_PASTE30, \ + NLOHMANN_JSON_PASTE29, \ + NLOHMANN_JSON_PASTE28, \ + NLOHMANN_JSON_PASTE27, \ + NLOHMANN_JSON_PASTE26, \ + NLOHMANN_JSON_PASTE25, \ + NLOHMANN_JSON_PASTE24, \ + NLOHMANN_JSON_PASTE23, \ + NLOHMANN_JSON_PASTE22, \ + NLOHMANN_JSON_PASTE21, \ + NLOHMANN_JSON_PASTE20, \ + NLOHMANN_JSON_PASTE19, \ + NLOHMANN_JSON_PASTE18, \ + NLOHMANN_JSON_PASTE17, \ + NLOHMANN_JSON_PASTE16, \ + NLOHMANN_JSON_PASTE15, \ + NLOHMANN_JSON_PASTE14, \ + NLOHMANN_JSON_PASTE13, \ + NLOHMANN_JSON_PASTE12, \ + NLOHMANN_JSON_PASTE11, \ + NLOHMANN_JSON_PASTE10, \ + NLOHMANN_JSON_PASTE9, \ + NLOHMANN_JSON_PASTE8, \ + NLOHMANN_JSON_PASTE7, \ + NLOHMANN_JSON_PASTE6, \ + NLOHMANN_JSON_PASTE5, \ + NLOHMANN_JSON_PASTE4, \ + NLOHMANN_JSON_PASTE3, \ + NLOHMANN_JSON_PASTE2, \ + NLOHMANN_JSON_PASTE1)(__VA_ARGS__)) +#define NLOHMANN_JSON_PASTE2(func, v1) func(v1) +#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2) +#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3) +#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4) +#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5) +#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6) +#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7) +#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8) +#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9) +#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10) +#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) +#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) +#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) +#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) +#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) +#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) +#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) +#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) +#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) +#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) +#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) +#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) +#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) +#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) +#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) +#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) +#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) +#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) +#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) +#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) +#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) +#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) +#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) +#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) +#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) +#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) +#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) +#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) +#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) +#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) +#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) +#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) +#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) +#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) +#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) +#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) +#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) +#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) +#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) +#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) +#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) +#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) +#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) +#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) +#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) +#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) +#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) +#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) +#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) +#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) +#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) +#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) +#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) + +#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1; +#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1); +#define NLOHMANN_JSON_FROM_WITH_DEFAULT(v1) nlohmann_json_t.v1 = nlohmann_json_j.value(#v1, nlohmann_json_default_obj.v1); + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_WITH_DEFAULT(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } + +#define NLOHMANN_DEFINE_TYPE_INTRUSIVE_ONLY_SERIALIZE(Type, ...) \ + friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } + +/*! +@brief macro +@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE +@since version 3.9.0 +*/ +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) } + +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_ONLY_SERIALIZE(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } + +#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE_WITH_DEFAULT(Type, ...) \ + inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \ + inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { const Type nlohmann_json_default_obj{}; NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM_WITH_DEFAULT, __VA_ARGS__)) } + +// inspired from https://stackoverflow.com/a/26745591 +// allows to call any std function as if (e.g. with begin): +// using std::begin; begin(x); +// +// it allows using the detected idiom to retrieve the return type +// of such an expression +#define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ + namespace detail { \ + using std::std_name; \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + } \ + \ + namespace detail2 { \ + struct std_name##_tag \ + { \ + }; \ + \ + template \ + std_name##_tag std_name(T&&...); \ + \ + template \ + using result_of_##std_name = decltype(std_name(std::declval()...)); \ + \ + template \ + struct would_call_std_##std_name \ + { \ + static constexpr auto const value = ::nlohmann::detail:: \ + is_detected_exact::value; \ + }; \ + } /* namespace detail2 */ \ + \ + template \ + struct would_call_std_##std_name : detail2::would_call_std_##std_name \ + { \ + } + +#ifndef JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_USE_IMPLICIT_CONVERSIONS 1 +#endif + +#if JSON_USE_IMPLICIT_CONVERSIONS + #define JSON_EXPLICIT +#else + #define JSON_EXPLICIT explicit +#endif + +#ifndef JSON_DISABLE_ENUM_SERIALIZATION + #define JSON_DISABLE_ENUM_SERIALIZATION 0 +#endif + +#ifndef JSON_USE_GLOBAL_UDLS + #define JSON_USE_GLOBAL_UDLS 1 +#endif + +#if JSON_HAS_THREE_WAY_COMPARISON + #include // partial_ordering +#endif + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +/////////////////////////// +// JSON type enumeration // +/////////////////////////// + +/*! +@brief the JSON type enumeration + +This enumeration collects the different JSON types. It is internally used to +distinguish the stored values, and the functions @ref basic_json::is_null(), +@ref basic_json::is_object(), @ref basic_json::is_array(), +@ref basic_json::is_string(), @ref basic_json::is_boolean(), +@ref basic_json::is_number() (with @ref basic_json::is_number_integer(), +@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()), +@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and +@ref basic_json::is_structured() rely on it. + +@note There are three enumeration entries (number_integer, number_unsigned, and +number_float), because the library distinguishes these three types for numbers: +@ref basic_json::number_unsigned_t is used for unsigned integers, +@ref basic_json::number_integer_t is used for signed integers, and +@ref basic_json::number_float_t is used for floating-point numbers or to +approximate integers which do not fit in the limits of their respective type. + +@sa see @ref basic_json::basic_json(const value_t value_type) -- create a JSON +value with the default value for a given type + +@since version 1.0.0 +*/ +enum class value_t : std::uint8_t +{ + null, ///< null value + object, ///< object (unordered set of name/value pairs) + array, ///< array (ordered collection of values) + string, ///< string value + boolean, ///< boolean value + number_integer, ///< number value (signed integer) + number_unsigned, ///< number value (unsigned integer) + number_float, ///< number value (floating-point) + binary, ///< binary array (ordered collection of bytes) + discarded ///< discarded by the parser callback function +}; + +/*! +@brief comparison operator for JSON types + +Returns an ordering that is similar to Python: +- order: null < boolean < number < object < array < string < binary +- furthermore, each type is not smaller than itself +- discarded values are not comparable +- binary is represented as a b"" string in python and directly comparable to a + string; however, making a binary array directly comparable with a string would + be surprising behavior in a JSON file. + +@since version 1.0.0 +*/ +#if JSON_HAS_THREE_WAY_COMPARISON + inline std::partial_ordering operator<=>(const value_t lhs, const value_t rhs) noexcept // *NOPAD* +#else + inline bool operator<(const value_t lhs, const value_t rhs) noexcept +#endif +{ + static constexpr std::array order = {{ + 0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */, + 1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */, + 6 /* binary */ + } + }; + + const auto l_index = static_cast(lhs); + const auto r_index = static_cast(rhs); +#if JSON_HAS_THREE_WAY_COMPARISON + if (l_index < order.size() && r_index < order.size()) + { + return order[l_index] <=> order[r_index]; // *NOPAD* + } + return std::partial_ordering::unordered; +#else + return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index]; +#endif +} + +// GCC selects the built-in operator< over an operator rewritten from +// a user-defined spaceship operator +// Clang, MSVC, and ICC select the rewritten candidate +// (see GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105200) +#if JSON_HAS_THREE_WAY_COMPARISON && defined(__GNUC__) +inline bool operator<(const value_t lhs, const value_t rhs) noexcept +{ + return std::is_lt(lhs <=> rhs); // *NOPAD* +} +#endif + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +/*! +@brief replace all occurrences of a substring by another string + +@param[in,out] s the string to manipulate; changed so that all + occurrences of @a f are replaced with @a t +@param[in] f the substring to replace with @a t +@param[in] t the string to replace @a f + +@pre The search string @a f must not be empty. **This precondition is +enforced with an assertion.** + +@since version 2.0.0 +*/ +template +inline void replace_substring(StringType& s, const StringType& f, + const StringType& t) +{ + JSON_ASSERT(!f.empty()); + for (auto pos = s.find(f); // find first occurrence of f + pos != StringType::npos; // make sure f was found + s.replace(pos, f.size(), t), // replace with t, and + pos = s.find(f, pos + t.size())) // find next occurrence of f + {} +} + +/*! + * @brief string escaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to escape + * @return escaped string + * + * Note the order of escaping "~" to "~0" and "/" to "~1" is important. + */ +template +inline StringType escape(StringType s) +{ + replace_substring(s, StringType{"~"}, StringType{"~0"}); + replace_substring(s, StringType{"/"}, StringType{"~1"}); + return s; +} + +/*! + * @brief string unescaping as described in RFC 6901 (Sect. 4) + * @param[in] s string to unescape + * @return unescaped string + * + * Note the order of escaping "~1" to "/" and "~0" to "~" is important. + */ +template +static void unescape(StringType& s) +{ + replace_substring(s, StringType{"~1"}, StringType{"/"}); + replace_substring(s, StringType{"~0"}, StringType{"~"}); +} + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // size_t + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +/// struct to capture the start position of the current token +struct position_t +{ + /// the total number of characters read + std::size_t chars_read_total = 0; + /// the number of characters read in the current line + std::size_t chars_read_current_line = 0; + /// the number of lines read + std::size_t lines_read = 0; + + /// conversion to size_t to preserve SAX interface + constexpr operator size_t() const + { + return chars_read_total; + } +}; + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + +// #include + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-FileCopyrightText: 2018 The Abseil Authors +// SPDX-License-Identifier: MIT + + + +#include // array +#include // size_t +#include // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type +#include // index_sequence, make_index_sequence, index_sequence_for + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +template +using uncvref_t = typename std::remove_cv::type>::type; + +#ifdef JSON_HAS_CPP_14 + +// the following utilities are natively available in C++14 +using std::enable_if_t; +using std::index_sequence; +using std::make_index_sequence; +using std::index_sequence_for; + +#else + +// alias templates to reduce boilerplate +template +using enable_if_t = typename std::enable_if::type; + +// The following code is taken from https://github.com/abseil/abseil-cpp/blob/10cb35e459f5ecca5b2ff107635da0bfa41011b4/absl/utility/utility.h +// which is part of Google Abseil (https://github.com/abseil/abseil-cpp), licensed under the Apache License 2.0. + +//// START OF CODE FROM GOOGLE ABSEIL + +// integer_sequence +// +// Class template representing a compile-time integer sequence. An instantiation +// of `integer_sequence` has a sequence of integers encoded in its +// type through its template arguments (which is a common need when +// working with C++11 variadic templates). `absl::integer_sequence` is designed +// to be a drop-in replacement for C++14's `std::integer_sequence`. +// +// Example: +// +// template< class T, T... Ints > +// void user_function(integer_sequence); +// +// int main() +// { +// // user_function's `T` will be deduced to `int` and `Ints...` +// // will be deduced to `0, 1, 2, 3, 4`. +// user_function(make_integer_sequence()); +// } +template +struct integer_sequence +{ + using value_type = T; + static constexpr std::size_t size() noexcept + { + return sizeof...(Ints); + } +}; + +// index_sequence +// +// A helper template for an `integer_sequence` of `size_t`, +// `absl::index_sequence` is designed to be a drop-in replacement for C++14's +// `std::index_sequence`. +template +using index_sequence = integer_sequence; + +namespace utility_internal +{ + +template +struct Extend; + +// Note that SeqSize == sizeof...(Ints). It's passed explicitly for efficiency. +template +struct Extend, SeqSize, 0> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)... >; +}; + +template +struct Extend, SeqSize, 1> +{ + using type = integer_sequence < T, Ints..., (Ints + SeqSize)..., 2 * SeqSize >; +}; + +// Recursion helper for 'make_integer_sequence'. +// 'Gen::type' is an alias for 'integer_sequence'. +template +struct Gen +{ + using type = + typename Extend < typename Gen < T, N / 2 >::type, N / 2, N % 2 >::type; +}; + +template +struct Gen +{ + using type = integer_sequence; +}; + +} // namespace utility_internal + +// Compile-time sequences of integers + +// make_integer_sequence +// +// This template alias is equivalent to +// `integer_sequence`, and is designed to be a drop-in +// replacement for C++14's `std::make_integer_sequence`. +template +using make_integer_sequence = typename utility_internal::Gen::type; + +// make_index_sequence +// +// This template alias is equivalent to `index_sequence<0, 1, ..., N-1>`, +// and is designed to be a drop-in replacement for C++14's +// `std::make_index_sequence`. +template +using make_index_sequence = make_integer_sequence; + +// index_sequence_for +// +// Converts a typename pack into an index sequence of the same length, and +// is designed to be a drop-in replacement for C++14's +// `std::index_sequence_for()` +template +using index_sequence_for = make_index_sequence; + +//// END OF CODE FROM GOOGLE ABSEIL + +#endif + +// dispatch utility (taken from ranges-v3) +template struct priority_tag : priority_tag < N - 1 > {}; +template<> struct priority_tag<0> {}; + +// taken from ranges-v3 +template +struct static_const +{ + static JSON_INLINE_VARIABLE constexpr T value{}; +}; + +#ifndef JSON_HAS_CPP_17 + template + constexpr T static_const::value; +#endif + +template +inline constexpr std::array make_array(Args&& ... args) +{ + return std::array {{static_cast(std::forward(args))...}}; +} + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // numeric_limits +#include // false_type, is_constructible, is_integral, is_same, true_type +#include // declval +#include // tuple +#include // char_traits + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +#include // random_access_iterator_tag + +// #include + +// #include + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN +namespace detail +{ + +template +struct iterator_types {}; + +template +struct iterator_types < + It, + void_t> +{ + using difference_type = typename It::difference_type; + using value_type = typename It::value_type; + using pointer = typename It::pointer; + using reference = typename It::reference; + using iterator_category = typename It::iterator_category; +}; + +// This is required as some compilers implement std::iterator_traits in a way that +// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341. +template +struct iterator_traits +{ +}; + +template +struct iterator_traits < T, enable_if_t < !std::is_pointer::value >> + : iterator_types +{ +}; + +template +struct iterator_traits::value>> +{ + using iterator_category = std::random_access_iterator_tag; + using value_type = T; + using difference_type = ptrdiff_t; + using pointer = T*; + using reference = T&; +}; + +} // namespace detail +NLOHMANN_JSON_NAMESPACE_END + +// #include + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN + +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(begin); + +NLOHMANN_JSON_NAMESPACE_END + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + + + +// #include + + +NLOHMANN_JSON_NAMESPACE_BEGIN + +NLOHMANN_CAN_CALL_STD_FUNC_IMPL(end); + +NLOHMANN_JSON_NAMESPACE_END + +// #include + +// #include + +// #include +// __ _____ _____ _____ +// __| | __| | | | JSON for Modern C++ +// | | |__ | | | | | | version 3.11.3 +// |_____|_____|_____|_|___| https://github.com/nlohmann/json +// +// SPDX-FileCopyrightText: 2013-2023 Niels Lohmann +// SPDX-License-Identifier: MIT + +#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_ + #define INCLUDE_NLOHMANN_JSON_FWD_HPP_ + + #include // int64_t, uint64_t + #include // map + #include // allocator + #include // string + #include // vector + + // #include + + + /*! + @brief namespace for Niels Lohmann + @see https://github.com/nlohmann + @since version 1.0.0 + */ + NLOHMANN_JSON_NAMESPACE_BEGIN + + /*! + @brief default JSONSerializer template argument + + This serializer ignores the template arguments and uses ADL + ([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl)) + for serialization. + */ + template + struct adl_serializer; + + /// a class to store JSON values + /// @sa https://json.nlohmann.me/api/basic_json/ + template class ObjectType = + std::map, + template class ArrayType = std::vector, + class StringType = std::string, class BooleanType = bool, + class NumberIntegerType = std::int64_t, + class NumberUnsignedType = std::uint64_t, + class NumberFloatType = double, + template class AllocatorType = std::allocator, + template class JSONSerializer = + adl_serializer, + class BinaryType = std::vector, // cppcheck-suppress syntaxError + class CustomBaseClass = void> + class basic_json; + + /// @brief JSON Pointer defines a string syntax for identifying a specific value within a JSON document + /// @sa https://json.nlohmann.me/api/json_pointer/ + template + class json_pointer; + + /*! + @brief default specialization + @sa https://json.nlohmann.me/api/json/ + */ + using json = basic_json<>; + + /// @brief a minimal map-like container that preserves insertion order + /// @sa https://json.nlohmann.me/api/ordered_map/ + template + struct ordered_map; + + /// @brief specialization that maintains the insertion order of object keys + /// @sa https://json.nlohmann.me/api/ordered_json/ + using ordered_json = basic_json; + + NLOHMANN_JSON_NAMESPACE_END + +#endif // INCLUDE_NLOHMANN_JSON_FWD_HPP_ + + +NLOHMANN_JSON_NAMESPACE_BEGIN +/*! +@brief detail namespace with internal helper functions + +This namespace collects functions that should not be exposed, +implementations of some @ref basic_json methods, and meta-programming helpers. + +@since version 2.1.0 +*/ +namespace detail +{ + +///////////// +// helpers // +///////////// + +// Note to maintainers: +// +// Every trait in this file expects a non CV-qualified type. +// The only exceptions are in the 'aliases for detected' section +// (i.e. those of the form: decltype(T::member_function(std::declval()))) +// +// In this case, T has to be properly CV-qualified to constraint the function arguments +// (e.g. to_json(BasicJsonType&, const T&)) + +template struct is_basic_json : std::false_type {}; + +NLOHMANN_BASIC_JSON_TPL_DECLARATION +struct is_basic_json : std::true_type {}; + +// used by exceptions create() member functions +// true_type for pointer to possibly cv-qualified basic_json or std::nullptr_t +// false_type otherwise +template +struct is_basic_json_context : + std::integral_constant < bool, + is_basic_json::type>::type>::value + || std::is_same::value > +{}; + +////////////////////// +// json_ref helpers // +////////////////////// + +template +class json_ref; + +template +struct is_json_ref : std::false_type {}; + +template +struct is_json_ref> : std::true_type {}; + +////////////////////////// +// aliases for detected // +////////////////////////// + +template +using mapped_type_t = typename T::mapped_type; + +template +using key_type_t = typename T::key_type; + +template +using value_type_t = typename T::value_type; + +template +using difference_type_t = typename T::difference_type; + +template +using pointer_t = typename T::pointer; + +template +using reference_t = typename T::reference; + +template +using iterator_category_t = typename T::iterator_category; + +template +using to_json_function = decltype(T::to_json(std::declval()...)); + +template +using from_json_function = decltype(T::from_json(std::declval()...)); + +template +using get_template_function = decltype(std::declval().template get()); + +// trait checking if JSONSerializer::from_json(json const&, udt&) exists +template +struct has_from_json : std::false_type {}; + +// trait checking if j.get is valid +// use this trait instead of std::is_constructible or std::is_convertible, +// both rely on, or make use of implicit conversions, and thus fail when T +// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958) +template +struct is_getable +{ + static constexpr bool value = is_detected::value; +}; + +template +struct has_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if JSONSerializer::from_json(json const&) exists +// this overload is used for non-default-constructible user-defined-types +template +struct has_non_default_from_json : std::false_type {}; + +template +struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +// This trait checks if BasicJsonType::json_serializer::to_json exists +// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion. +template +struct has_to_json : std::false_type {}; + +template +struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json::value >> +{ + using serializer = typename BasicJsonType::template json_serializer; + + static constexpr bool value = + is_detected_exact::value; +}; + +template +using detect_key_compare = typename T::key_compare; + +template +struct has_key_compare : std::integral_constant::value> {}; + +// obtains the actual object key comparator +template +struct actual_object_comparator +{ + using object_t = typename BasicJsonType::object_t; + using object_comparator_t = typename BasicJsonType::default_object_comparator_t; + using type = typename std::conditional < has_key_compare::value, + typename object_t::key_compare, object_comparator_t>::type; +}; + +template +using actual_object_comparator_t = typename actual_object_comparator::type; + +///////////////// +// char_traits // +///////////////// + +// Primary template of char_traits calls std char_traits +template +struct char_traits : std::char_traits +{}; + +// Explicitly define char traits for unsigned char since it is not standard +template<> +struct char_traits : std::char_traits +{ + using char_type = unsigned char; + using int_type = uint64_t; + + // Redefine to_int_type function + static int_type to_int_type(char_type c) noexcept + { + return static_cast(c); + } + + static char_type to_char_type(int_type i) noexcept + { + return static_cast(i); + } + + static constexpr int_type eof() noexcept + { + return static_cast(EOF); + } +}; + +// Explicitly define char traits for signed char since it is not standard +template<> +struct char_traits : std::char_traits +{ + using char_type = signed char; + using int_type = uint64_t; + + // Redefine to_int_type function + static int_type to_int_type(char_type c) noexcept + { + return static_cast(c); + } + + static char_type to_char_type(int_type i) noexcept + { + return static_cast(i); + } + + static constexpr int_type eof() noexcept + { + return static_cast(EOF); + } +}; + +/////////////////// +// is_ functions // +/////////////////// + +// https://en.cppreference.com/w/cpp/types/conjunction +template struct conjunction : std::true_type { }; +template struct conjunction : B { }; +template +struct conjunction +: std::conditional(B::value), conjunction, B>::type {}; + +// https://en.cppreference.com/w/cpp/types/negation +template struct negation : std::integral_constant < bool, !B::value > { }; + +// Reimplementation of is_constructible and is_default_constructible, due to them being broken for +// std::pair and std::tuple until LWG 2367 fix (see https://cplusplus.github.io/LWG/lwg-defects.html#2367). +// This causes compile errors in e.g. clang 3.5 or gcc 4.9. +template +struct is_default_constructible : std::is_default_constructible {}; + +template +struct is_default_constructible> + : conjunction, is_default_constructible> {}; + +template +struct is_default_constructible> + : conjunction, is_default_constructible> {}; + +template +struct is_default_constructible> + : conjunction...> {}; + +template +struct is_default_constructible> + : conjunction...> {}; + +template +struct is_constructible : std::is_constructible {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_constructible> : is_default_constructible> {}; + +template +struct is_iterator_traits : std::false_type {}; + +template +struct is_iterator_traits> +{ + private: + using traits = iterator_traits; + + public: + static constexpr auto value = + is_detected::value && + is_detected::value && + is_detected::value && + is_detected::value && + is_detected::value; +}; + +template +struct is_range +{ + private: + using t_ref = typename std::add_lvalue_reference::type; + + using iterator = detected_t; + using sentinel = detected_t; + + // to be 100% correct, it should use https://en.cppreference.com/w/cpp/iterator/input_or_output_iterator + // and https://en.cppreference.com/w/cpp/iterator/sentinel_for + // but reimplementing these would be too much work, as a lot of other concepts are used underneath + static constexpr auto is_iterator_begin = + is_iterator_traits>::value; + + public: + static constexpr bool value = !std::is_same::value && !std::is_same::value && is_iterator_begin; +}; + +template +using iterator_t = enable_if_t::value, result_of_begin())>>; + +template +using range_value_t = value_type_t>>; + +// The following implementation of is_complete_type is taken from +// https://blogs.msdn.microsoft.com/vcblog/2015/12/02/partial-support-for-expression-sfinae-in-vs-2015-update-1/ +// and is written by Xiang Fan who agreed to using it in this library. + +template +struct is_complete_type : std::false_type {}; + +template +struct is_complete_type : std::true_type {}; + +template +struct is_compatible_object_type_impl : std::false_type {}; + +template +struct is_compatible_object_type_impl < + BasicJsonType, CompatibleObjectType, + enable_if_t < is_detected::value&& + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + // macOS's is_constructible does not play well with nonesuch... + static constexpr bool value = + is_constructible::value && + is_constructible::value; +}; + +template +struct is_compatible_object_type + : is_compatible_object_type_impl {}; + +template +struct is_constructible_object_type_impl : std::false_type {}; + +template +struct is_constructible_object_type_impl < + BasicJsonType, ConstructibleObjectType, + enable_if_t < is_detected::value&& + is_detected::value >> +{ + using object_t = typename BasicJsonType::object_t; + + static constexpr bool value = + (is_default_constructible::value && + (std::is_move_assignable::value || + std::is_copy_assignable::value) && + (is_constructible::value && + std::is_same < + typename object_t::mapped_type, + typename ConstructibleObjectType::mapped_type >::value)) || + (has_from_json::value || + has_non_default_from_json < + BasicJsonType, + typename ConstructibleObjectType::mapped_type >::value); +}; + +template +struct is_constructible_object_type + : is_constructible_object_type_impl {}; + +template +struct is_compatible_string_type +{ + static constexpr auto value = + is_constructible::value; +}; + +template +struct is_constructible_string_type +{ + // launder type through decltype() to fix compilation failure on ICPC +#ifdef __INTEL_COMPILER + using laundered_type = decltype(std::declval()); +#else + using laundered_type = ConstructibleStringType; +#endif + + static constexpr auto value = + conjunction < + is_constructible, + is_detected_exact>::value; +}; + +template +struct is_compatible_array_type_impl : std::false_type {}; + +template +struct is_compatible_array_type_impl < + BasicJsonType, CompatibleArrayType, + enable_if_t < + is_detected::value&& + is_iterator_traits>>::value&& +// special case for types like std::filesystem::path whose iterator's value_type are themselves +// c.f. https://github.com/nlohmann/json/pull/3073 + !std::is_same>::value >> +{ + static constexpr bool value = + is_constructible>::value; +}; + +template +struct is_compatible_array_type + : is_compatible_array_type_impl {}; + +template +struct is_constructible_array_type_impl : std::false_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t::value >> + : std::true_type {}; + +template +struct is_constructible_array_type_impl < + BasicJsonType, ConstructibleArrayType, + enable_if_t < !std::is_same::value&& + !is_compatible_string_type::value&& + is_default_constructible::value&& +(std::is_move_assignable::value || + std::is_copy_assignable::value)&& +is_detected::value&& +is_iterator_traits>>::value&& +is_detected::value&& +// special case for types like std::filesystem::path whose iterator's value_type are themselves +// c.f. https://github.com/nlohmann/json/pull/3073 +!std::is_same>::value&& + is_complete_type < + detected_t>::value >> +{ + using value_type = range_value_t; + + static constexpr bool value = + std::is_same::value || + has_from_json::value || + has_non_default_from_json < + BasicJsonType, + value_type >::value; +}; + +template +struct is_constructible_array_type + : is_constructible_array_type_impl {}; + +template +struct is_compatible_integer_type_impl : std::false_type {}; + +template +struct is_compatible_integer_type_impl < + RealIntegerType, CompatibleNumberIntegerType, + enable_if_t < std::is_integral::value&& + std::is_integral::value&& + !std::is_same::value >> +{ + // is there an assert somewhere on overflows? + using RealLimits = std::numeric_limits; + using CompatibleLimits = std::numeric_limits; + + static constexpr auto value = + is_constructible::value && + CompatibleLimits::is_integer && + RealLimits::is_signed == CompatibleLimits::is_signed; +}; + +template +struct is_compatible_integer_type + : is_compatible_integer_type_impl {}; + +template +struct is_compatible_type_impl: std::false_type {}; + +template +struct is_compatible_type_impl < + BasicJsonType, CompatibleType, + enable_if_t::value >> +{ + static constexpr bool value = + has_to_json::value; +}; + +template +struct is_compatible_type + : is_compatible_type_impl {}; + +template +struct is_constructible_tuple : std::false_type {}; + +template +struct is_constructible_tuple> : conjunction...> {}; + +template +struct is_json_iterator_of : std::false_type {}; + +template +struct is_json_iterator_of : std::true_type {}; + +template +struct is_json_iterator_of : std::true_type +{}; + +// checks if a given type T is a template specialization of Primary +template