X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkernel_worker.h;h=93ee62cbea4a8f211314809c894dc007e94a137e;hb=63e4509c569f16145ab861717baf865fc6d05af1;hp=7bea4231c417be0f347fc097d4919d207ebada18;hpb=fe038d999ac1d67fa617f0a0e7aeae96a4d4cd04;p=novacoin.git

diff --git a/src/kernel_worker.h b/src/kernel_worker.h
index 7bea423..93ee62c 100644
--- a/src/kernel_worker.h
+++ b/src/kernel_worker.h
@@ -1,10 +1,8 @@
-#ifndef BITCOIN_HERNELWORKER_H
-#define BITCOIN_HERNELWORKER_H
+#ifndef NOVACOIN_KERNELWORKER_H
+#define NOVACOIN_KERNELWORKER_H
 
 #include <vector>
 
-using namespace std;
-
 class KernelWorker
 {
 public:
@@ -12,24 +10,16 @@ public:
     { }
     KernelWorker(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, uint32_t nIntervalBegin, uint32_t nIntervalEnd);
     void Do();
-    vector<pair<uint256,uint32_t> >& GetSolutions();
+    std::vector<std::pair<uint256,uint32_t> >& GetSolutions();
 
 private:
-#ifdef USE_ASM
-#ifdef __x86_64__
-    // AVX2 CPUs: 8-way hashing.
-    void Do_8way();
-#endif
-    // SSE2, Neon: 4-way hashing.
-    void Do_4way();
-#endif
     // One way hashing.
     void Do_generic();
 
     // Kernel solutions.
-    vector<pair<uint256,uint32_t> > solutions;
+    std::vector<std::pair<uint256,uint32_t> > solutions;
 
-    // Kernel metadaya
+    // Kernel metadata.
     uint8_t *kernel;
     uint32_t nBits;
     uint32_t nInputTxTime;
@@ -41,6 +31,6 @@ private:
 };
 
 // Scan given kernel for solutions
-bool ScanKernelBackward(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, pair<uint32_t, uint32_t> &SearchInterval, pair<uint256, uint32_t> &solution);
+bool ScanKernelBackward(unsigned char *kernel, uint32_t nBits, uint32_t nInputTxTime, int64_t nValueIn, std::pair<uint32_t, uint32_t> &SearchInterval, std::pair<uint256, uint32_t> &solution);
 
-#endif
+#endif // NOVACOIN_KERNELWORKER_H
\ No newline at end of file