Remove namespaces from header files

diff --git a/src/kernel.h b/src/kernel.h
index c76c00d..464e401 100644 (file)
--- a/src/kernel.h
+++ b/src/kernel.h
@@ -7,8 +7,6 @@
 #include "main.h"
 #include "wallet.h"
 
-using namespace std;
-
 // ChainDB upgrade time
 extern unsigned int nModifierUpgradeTime;
 
@@ -55,8 +53,7 @@ inline int64_t GetWeight(int64_t nIntervalBeginning, int64_t nIntervalEnd)
     //
     // Maximum TimeWeight is 90 days.
 
-    return min(nIntervalEnd - nIntervalBeginning - nStakeMinAge, (int64_t)nStakeMaxAge);
+    return std::min(nIntervalEnd - nIntervalBeginning - nStakeMinAge, (int64_t)nStakeMaxAge);
 }
 
-
-#endif // PPCOIN_KERNEL_H
+#endif // PPCOIN_KERNEL_H
\ No newline at end of file

diff --git a/src/kernel_worker.h b/src/kernel_worker.h
index 25e731a..93ee62c 100644 (file)
--- 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,16 +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:
     // 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;
@@ -33,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