Merged PR 3440: CLEANUP: Replaced snprintf with memcpy as the scenari…

…o is not using the subst... CLEANUP: Replaced snprintf with memcpy as the scenario is not using the substituted argument. CLEANUP: Fixed compilation warnings. BUG: The examples MetaData.cpp now deletes the correct properties object. OPTIM: While computing the hash code, make sure to check that the returned item has value before accessing it. EXAMPLE: Added the tests for CPP examples.
51Degrees · Jan 14, 2021 · 0451c19 · 0451c19
2 parents a668168 + 0824bdc
commit 0451c19
Show file tree

Hide file tree

Showing 26 changed files with 495 additions and 164 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,9 +45,9 @@ FILE(GLOB HASHC_H ${HASH}/*.h)
 add_library(fiftyone-hash-c ${HASHC_SRC} ${HASHC_H})
 target_link_libraries(fiftyone-hash-c fiftyone-device-detection-c)
 if (MSVC)
-	target_compile_options(fiftyone-hash-c PRIVATE "/D_CRT_SECURE_NO_WARNINGS")
+	target_compile_options(fiftyone-hash-c PRIVATE "/D_CRT_SECURE_NO_WARNINGS" "/WX")
 else()
-	target_compile_options(fiftyone-hash-c PRIVATE ${COMPILE_OPTION_DEBUG})
+	target_compile_options(fiftyone-hash-c PRIVATE ${COMPILE_OPTION_DEBUG} "-Werror")
 endif()
 
 FILE(GLOB HASHCPP_SRC ${HASH}/*.cpp)
@@ -57,9 +57,9 @@ target_link_libraries(fiftyone-hash-cxx
 	fiftyone-hash-c
 	fiftyone-device-detection-cxx)
 if (MSVC)
-	target_compile_options(fiftyone-hash-cxx PRIVATE "/D_CRT_SECURE_NO_WARNINGS")
+	target_compile_options(fiftyone-hash-cxx PRIVATE "/D_CRT_SECURE_NO_WARNINGS" "/WX")
 else()
-	target_compile_options(fiftyone-hash-cxx PRIVATE ${COMPILE_OPTION_DEBUG})
+	target_compile_options(fiftyone-hash-cxx PRIVATE ${COMPILE_OPTION_DEBUG} "-Werror")
 endif()
 
 set_target_properties(fiftyone-hash-c fiftyone-hash-cxx
@@ -71,9 +71,9 @@ file(WRITE null.cpp "")
 add_library(fiftyone-device-detection-complete SHARED null.cpp)
 target_link_libraries(fiftyone-device-detection-complete fiftyone-hash-cxx)
 if (MSVC)
-	target_compile_options(fiftyone-device-detection-complete PRIVATE "/D_CRT_SECURE_NO_WARNINGS")
+	target_compile_options(fiftyone-device-detection-complete PRIVATE "/D_CRT_SECURE_NO_WARNINGS" "/WX")
 else()
-	target_compile_options(fiftyone-device-detection-complete PRIVATE ${COMPILE_OPTION_DEBUG})
+	target_compile_options(fiftyone-device-detection-complete PRIVATE ${COMPILE_OPTION_DEBUG} "-Werror")
 endif()
 
 set_target_properties(fiftyone-device-detection-complete PROPERTIES PUBLIC_HEADER "${HASH}/hash.h")
@@ -128,9 +128,9 @@ foreach (api "Hash")
 					PROPERTIES FOLDER
 					"Examples/Device Detection/${api}/${upperlangext}")
 				if (MSVC)
-					target_compile_options(${name} PRIVATE "/D_CRT_SECURE_NO_WARNINGS")
+					target_compile_options(${name} PRIVATE "/D_CRT_SECURE_NO_WARNINGS" "/WX")
 				else()
-					target_compile_options(${name} PRIVATE ${COMPILE_OPTION_DEBUG})
+					target_compile_options(${name} PRIVATE ${COMPILE_OPTION_DEBUG} "-Werror")
 				endif()
 			endif()
 		endforeach()
@@ -160,7 +160,10 @@ endif()
 
 set_target_properties(fiftyone-device-detection-test-base PROPERTIES FOLDER "Tests") 
 
-add_executable(HashTests ${HASH_TEST_SRC} ${HASH_TEST_H})
+add_executable(HashTests 
+	${HASH_TEST_SRC} ${HASH_TEST_H}
+	${CMAKE_CURRENT_LIST_DIR}/examples/CPP/Hash/ExampleBase.cpp
+	${CMAKE_CURRENT_LIST_DIR}/examples/CPP/Hash/ExampleBase.hpp)
 target_link_libraries(HashTests
 	fiftyone-device-detection-test-base
    		fiftyone-hash-cxx)

diff --git a/VisualStudio/DeviceDetection.sln b/VisualStudio/DeviceDetection.sln
@@ -621,26 +621,26 @@ Global
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug|x64.Build.0 = Debug|x64
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug|x86.ActiveCfg = Debug|Win32
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug|x86.Build.0 = Debug|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x64.ActiveCfg = Debug|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x64.Build.0 = Debug|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x86.ActiveCfg = Debug|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x86.Build.0 = Debug|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x64.ActiveCfg = Debug|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x64.Build.0 = Debug|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x86.ActiveCfg = Debug|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x86.Build.0 = Debug|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x64.ActiveCfg = Debug-MemoryOnly|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x64.Build.0 = Debug-MemoryOnly|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x86.ActiveCfg = Debug-MemoryOnly|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-MemoryOnly|x86.Build.0 = Debug-MemoryOnly|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x64.ActiveCfg = Debug-Single|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x64.Build.0 = Debug-Single|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x86.ActiveCfg = Debug-Single|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Debug-Single|x86.Build.0 = Debug-Single|Win32
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release|x64.ActiveCfg = Release|x64
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release|x64.Build.0 = Release|x64
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release|x86.ActiveCfg = Release|Win32
 		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release|x86.Build.0 = Release|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x64.ActiveCfg = Release|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x64.Build.0 = Release|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x86.ActiveCfg = Release|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x86.Build.0 = Release|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x64.ActiveCfg = Release|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x64.Build.0 = Release|x64
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x86.ActiveCfg = Release|Win32
-		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x86.Build.0 = Release|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x64.ActiveCfg = Release-MemoryOnly|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x64.Build.0 = Release-MemoryOnly|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x86.ActiveCfg = Release-MemoryOnly|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-MemoryOnly|x86.Build.0 = Release-MemoryOnly|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x64.ActiveCfg = Release-Single|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x64.Build.0 = Release-Single|x64
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x86.ActiveCfg = Release-Single|Win32
+		{1D1FB480-9E69-4C1D-A120-1601B00B2457}.Release-Single|x86.Build.0 = Release-Single|Win32
 		{22E3BB54-2542-4641-9A07-7EFE0DD64670}.Debug|x64.ActiveCfg = Debug|x64
 		{22E3BB54-2542-4641-9A07-7EFE0DD64670}.Debug|x64.Build.0 = Debug|x64
 		{22E3BB54-2542-4641-9A07-7EFE0DD64670}.Debug|x86.ActiveCfg = Debug|Win32

diff --git a/VisualStudio/FiftyOne.DeviceDetection.C/FiftyOne.DeviceDetection.C.vcxproj b/VisualStudio/FiftyOne.DeviceDetection.C/FiftyOne.DeviceDetection.C.vcxproj
@@ -226,6 +226,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -248,6 +249,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -270,6 +272,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -288,6 +291,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -306,6 +310,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -324,6 +329,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -340,6 +346,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -358,6 +365,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -376,6 +384,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -394,6 +403,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -416,6 +426,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -438,6 +449,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/VisualStudio/FiftyOne.DeviceDetection.CPP/FiftyOne.DeviceDetection.CPP.vcxproj b/VisualStudio/FiftyOne.DeviceDetection.CPP/FiftyOne.DeviceDetection.CPP.vcxproj
@@ -246,6 +246,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -268,6 +269,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -290,6 +292,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -308,6 +311,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -326,6 +330,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -344,6 +349,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -360,6 +366,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -378,6 +385,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -396,6 +404,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -414,6 +423,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -436,6 +446,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -458,6 +469,7 @@
       </PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>
       </PrecompiledHeaderOutputFile>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/VisualStudio/FiftyOne.DeviceDetection.Hash.C/FiftyOne.DeviceDetection.Hash.C.vcxproj b/VisualStudio/FiftyOne.DeviceDetection.Hash.C/FiftyOne.DeviceDetection.Hash.C.vcxproj
@@ -246,6 +246,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -266,6 +267,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -286,6 +288,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -306,6 +309,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -327,6 +331,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -350,6 +355,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -373,6 +379,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -396,6 +403,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -417,6 +425,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -436,6 +445,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -456,6 +466,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -478,6 +489,7 @@
       <CompileAs>Default</CompileAs>
       <ExceptionHandling>false</ExceptionHandling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>