From 5491cf018a5004de948392e549c2ae076a23b520 Mon Sep 17 00:00:00 2001
From: psychocrypt <psychocryptHPC@gmail.com>
Date: Mon, 2 Apr 2018 20:59:58 +0200
Subject: [PATCH] change `height` to `version`

-rename `mining_fork_height` to `*_version`
---
 xmrstak/backend/amd/minethd.cpp    | 2 +-
 xmrstak/backend/cpu/minethd.cpp    | 4 ++--
 xmrstak/backend/nvidia/minethd.cpp | 2 +-
 xmrstak/jconf.cpp                  | 4 ++--
 xmrstak/jconf.hpp                  | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/xmrstak/backend/amd/minethd.cpp b/xmrstak/backend/amd/minethd.cpp
index bc14e44..cab5ad9 100644
--- a/xmrstak/backend/amd/minethd.cpp
+++ b/xmrstak/backend/amd/minethd.cpp
@@ -219,7 +219,7 @@ void minethd::work_main()
 		uint8_t new_version = oWork.getVersion();
 		if(new_version != version)
 		{
-			if(new_version >= ::jconf::inst()->GetMiningForkHeight())
+			if(new_version >= ::jconf::inst()->GetMiningForkVersion())
 			{
 				miner_algo = ::jconf::inst()->GetMiningAlgo();
 				hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo);
diff --git a/xmrstak/backend/cpu/minethd.cpp b/xmrstak/backend/cpu/minethd.cpp
index 4c55515..5b56f85 100644
--- a/xmrstak/backend/cpu/minethd.cpp
+++ b/xmrstak/backend/cpu/minethd.cpp
@@ -463,7 +463,7 @@ void minethd::work_main()
 		uint8_t new_version = oWork.getVersion();
 		if(new_version != version)
 		{
-			if(new_version >= ::jconf::inst()->GetMiningForkHeight())
+			if(new_version >= ::jconf::inst()->GetMiningForkVersion())
 			{
 				miner_algo = ::jconf::inst()->GetMiningAlgo();
 				hash_fun = func_selector(::jconf::inst()->HaveHardwareAes(), bNoPrefetch, miner_algo);
@@ -720,7 +720,7 @@ void minethd::multiway_work_main()
 		uint8_t new_version = oWork.getVersion();
 		if(new_version != version)
 		{
-			if(new_version >= ::jconf::inst()->GetMiningForkHeight())
+			if(new_version >= ::jconf::inst()->GetMiningForkVersion())
 			{
 				miner_algo = ::jconf::inst()->GetMiningAlgo();
 				hash_fun_multi = func_multi_selector(N, ::jconf::inst()->HaveHardwareAes(), bNoPrefetch, miner_algo);
diff --git a/xmrstak/backend/nvidia/minethd.cpp b/xmrstak/backend/nvidia/minethd.cpp
index 917101f..804c06a 100644
--- a/xmrstak/backend/nvidia/minethd.cpp
+++ b/xmrstak/backend/nvidia/minethd.cpp
@@ -266,7 +266,7 @@ void minethd::work_main()
 		uint8_t new_version = oWork.getVersion();
 		if(new_version != version)
 		{
-			if(new_version >= ::jconf::inst()->GetMiningForkHeight())
+			if(new_version >= ::jconf::inst()->GetMiningForkVersion())
 			{
 				miner_algo = ::jconf::inst()->GetMiningAlgo();
 				hash_fun = cpu::minethd::func_selector(::jconf::inst()->HaveHardwareAes(), true /*bNoPrefetch*/, miner_algo);
diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp
index 87cb3e9..f99698a 100644
--- a/xmrstak/jconf.cpp
+++ b/xmrstak/jconf.cpp
@@ -91,7 +91,7 @@ struct xmrstak_coin_algo
 	const char* coin_name;
 	xmrstak_algo algo;
 	xmrstak_algo algo_root;
-	uint8_t fork_height;
+	uint8_t fork_version;
 	const char* default_pool;
 };
 
@@ -634,7 +634,7 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools)
 		{
 			mining_algo = coin_algos[i].algo;
 			mining_algo_root = coin_algos[i].algo_root;
-			mining_fork_height = coin_algos[i].fork_height;
+			mining_fork_version = coin_algos[i].fork_version;
 			break;
 		}
 	}
diff --git a/xmrstak/jconf.hpp b/xmrstak/jconf.hpp
index 336e4be..76b93dd 100644
--- a/xmrstak/jconf.hpp
+++ b/xmrstak/jconf.hpp
@@ -52,7 +52,7 @@ public:
 
 	inline xmrstak_algo GetMiningAlgoRoot() const { return mining_algo_root; }
 
-	inline uint8_t GetMiningForkHeight() const { return mining_fork_height; }
+	inline uint8_t GetMiningForkVersion() const { return mining_fork_version; }
 	
 	std::string GetMiningCoin();
 
@@ -96,5 +96,5 @@ private:
 	bool bHaveAes;
 	xmrstak_algo mining_algo;
 	xmrstak_algo mining_algo_root;
-	uint8_t mining_fork_height;
+	uint8_t mining_fork_version;
 };
-- 
GitLab