aboutsummaryrefslogtreecommitdiff
path: root/src/main.h
diff options
context:
space:
mode:
authorEric Lombrozo <elombrozo@gmail.com>2013-01-08 03:02:51 -0800
committerEric Lombrozo <elombrozo@gmail.com>2013-06-05 23:14:52 -0700
commiteffc2770f50554416e7d7b27f5c5b5cef9489440 (patch)
tree353bbbdc57b6d8fcb24b74b83945f031db842c32 /src/main.h
parent663224c2324d64134f8587fe77d1d787c0353b20 (diff)
downloadbitcoin-effc2770f50554416e7d7b27f5c5b5cef9489440.tar.xz
Created core.h/core.cpp, added to makefiles. Started moving core structures from main to core beginning with COutPoint.
Diffstat (limited to 'src/main.h')
-rw-r--r--src/main.h42
1 files changed, 1 insertions, 41 deletions
diff --git a/src/main.h b/src/main.h
index feaa10318c..099e436d9e 100644
--- a/src/main.h
+++ b/src/main.h
@@ -5,6 +5,7 @@
#ifndef BITCOIN_MAIN_H
#define BITCOIN_MAIN_H
+#include "core.h"
#include "bignum.h"
#include "sync.h"
#include "net.h"
@@ -267,47 +268,6 @@ public:
-/** An outpoint - a combination of a transaction hash and an index n into its vout */
-class COutPoint
-{
-public:
- uint256 hash;
- unsigned int n;
-
- COutPoint() { SetNull(); }
- COutPoint(uint256 hashIn, unsigned int nIn) { hash = hashIn; n = nIn; }
- IMPLEMENT_SERIALIZE( READWRITE(FLATDATA(*this)); )
- void SetNull() { hash = 0; n = (unsigned int) -1; }
- bool IsNull() const { return (hash == 0 && n == (unsigned int) -1); }
-
- friend bool operator<(const COutPoint& a, const COutPoint& b)
- {
- return (a.hash < b.hash || (a.hash == b.hash && a.n < b.n));
- }
-
- friend bool operator==(const COutPoint& a, const COutPoint& b)
- {
- return (a.hash == b.hash && a.n == b.n);
- }
-
- friend bool operator!=(const COutPoint& a, const COutPoint& b)
- {
- return !(a == b);
- }
-
- std::string ToString() const
- {
- return strprintf("COutPoint(%s, %u)", hash.ToString().c_str(), n);
- }
-
- void print() const
- {
- printf("%s\n", ToString().c_str());
- }
-};
-
-
-
/** An input of a transaction. It contains the location of the previous
* transaction's output that it claims and a signature that matches the