From 1f16817ef08d77f6d1a7b6c068341438414dc58d Mon Sep 17 00:00:00 2001
From: RD42 <42702181+dashr9230@users.noreply.github.com>
Date: Tue, 6 Feb 2024 21:23:49 +0800
Subject: [PATCH] [saco] Rename sha1.cpp/.h to fhicl-sha1.cpp/.h

Due to a object file conflict with RakNet's SHA1
---
 saco/{sha1.cpp => fhicl-sha1.cpp} |  6 +++---
 saco/{sha1.h => fhicl-sha1.h}     |  6 +++---
 saco/saco.vcproj                  | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename saco/{sha1.cpp => fhicl-sha1.cpp} (99%)
 rename saco/{sha1.h => fhicl-sha1.h} (93%)

diff --git a/saco/sha1.cpp b/saco/fhicl-sha1.cpp
similarity index 99%
rename from saco/sha1.cpp
rename to saco/fhicl-sha1.cpp
index b8106ad..f10d1ac 100644
--- a/saco/sha1.cpp
+++ b/saco/fhicl-sha1.cpp
@@ -1,12 +1,12 @@
 /*
- *  sha1.cpp
+ *  fhicl-sha1.cpp
  *
  *  Copyright (C) 1998, 2009
  *  Paul E. Jones <paulej@packetizer.com>
  *  All Rights Reserved.
  *
  *****************************************************************************
- *  $Id: sha1.cpp 12 2009-06-22 19:34:25Z paulej $
+ *  $Id: fhicl-sha1.cpp 12 2009-06-22 19:34:25Z paulej $
  *****************************************************************************
  *
  *  Description:
@@ -37,7 +37,7 @@
  *
  */
 
-#include "sha1.h"
+#include "fhicl-sha1.h"
 
 namespace fhicl {
 
diff --git a/saco/sha1.h b/saco/fhicl-sha1.h
similarity index 93%
rename from saco/sha1.h
rename to saco/fhicl-sha1.h
index bc8043c..4afdeb8 100644
--- a/saco/sha1.h
+++ b/saco/fhicl-sha1.h
@@ -1,12 +1,12 @@
 /*
- *  sha1.h
+ *  fhicl-sha1.h
  *
  *  Copyright (C) 1998, 2009
  *  Paul E. Jones <paulej@packetizer.com>
  *  All Rights Reserved.
  *
  *****************************************************************************
- *  $Id: sha1.h 12 2009-06-22 19:34:25Z paulej $
+ *  $Id: fhicl-sha1.h 12 2009-06-22 19:34:25Z paulej $
  *****************************************************************************
  *
  *  Description:
@@ -17,7 +17,7 @@
  *      character names, were used because those were the names used
  *      in the publication.
  *
- *      Please read the file sha1.cpp for more information.
+ *      Please read the file fhicl-sha1.cpp for more information.
  *
  */
 
diff --git a/saco/saco.vcproj b/saco/saco.vcproj
index 37175fc..132a435 100644
--- a/saco/saco.vcproj
+++ b/saco/saco.vcproj
@@ -429,6 +429,12 @@
 		<File
 			RelativePath=".\exceptions.cpp">
 		</File>
+		<File
+			RelativePath=".\fhicl-sha1.cpp">
+		</File>
+		<File
+			RelativePath=".\fhicl-sha1.h">
+		</File>
 		<File
 			RelativePath=".\filesystem.cpp">
 		</File>
@@ -477,12 +483,6 @@
 		<File
 			RelativePath=".\saco.rc">
 		</File>
-		<File
-			RelativePath=".\sha1.cpp">
-		</File>
-		<File
-			RelativePath=".\sha1.h">
-		</File>
 		<File
 			RelativePath=".\subclass.cpp">
 		</File>