Merge branch 'master' of https://github.com/SrTobi/RakNet

Luke1410 · Luke1410 · commit 7b55bb28e9fe · 2017-07-31T02:23:16.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,6 +53,6 @@ add_subdirectory(Lib)
 
 set(RAKNET_COMMON_LIBS RakNetLibStatic)
 
-if( RAKNET_GENERATE_SAMPLES )
+if( RAKNET_ENABLE_SAMPLES )
 	add_subdirectory(Samples)
 endif()
diff --git a/Source/BitStream.h b/Source/BitStream.h
@@ -2022,7 +2022,7 @@ namespace RakNet
 	}
 
 	template <class templateType>
-	BitStream& operator<<(BitStream& out, templateType& c)
+	BitStream& operator<<(BitStream& out, const templateType& c)
 	{
 		out.Write(c);
 		return out;

Original file line number	Diff line number	Diff line change
`@@ -2022,7 +2022,7 @@ namespace RakNet`
`2022`	`2022`	`}`
`2023`	`2023`
`2024`	`2024`	`template <class templateType>`
`2025`		`- BitStream& operator<<(BitStream& out, templateType& c)`
	`2025`	`+ BitStream& operator<<(BitStream& out, const templateType& c)`
`2026`	`2026`	`{`
`2027`	`2027`	`out.Write(c);`
`2028`	`2028`	`return out;`