Rename types.h to IntegerTypes.h and move to ripple_basics.h

modules/ripple_basics/ripple_basics.h

@@ -32,6 +32,6 @@
 #ifndef RIPPLE_BASICS_H
 #define RIPPLE_BASICS_H
 
-
+#include "src/cpp/ripple/IntegerTypes.h"
 
 #endif

modules/ripple_client/ripple_client.h

@@ -32,6 +32,6 @@
 #ifndef RIPPLE_CLIENT_H
 #define RIPPLE_CLIENT_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif

modules/ripple_db/ripple_db.h

@@ -32,6 +32,6 @@
 #ifndef RIPPLE_DB_H
 #define RIPPLE_DB_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif

modules/ripple_ledger/ripple_ledger.h

@@ -32,6 +32,6 @@
 #ifndef RIPPLE_LEDGER_H
 #define RIPPLE_LEDGER_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif

modules/ripple_main/ripple_main.h

@@ -32,6 +32,6 @@
 #ifndef RIPPLE_MAIN_H
 #define RIPPLE_MAIN_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif

modules/ripple_net/ripple_net.h

@@ -32,6 +32,6 @@
 #ifndef RIPPLE_NET_H
 #define RIPPLE_NET_H
 
-
+#include "modules/ripple_basics/ripple_basics.h"
 
 #endif

newcoin.vcxproj

@@ -1625,7 +1625,7 @@
     <ClInclude Include="src\cpp\ripple\TransactionQueue.h" />
     <ClInclude Include="src\cpp\ripple\Transactor.h" />
     <ClInclude Include="src\cpp\ripple\TrustSetTransactor.h" />
-    <ClInclude Include="src\cpp\ripple\types.h" />
+    <ClInclude Include="src\cpp\ripple\IntegerTypes.h" />
     <ClInclude Include="src\cpp\ripple\uint256.h" />
     <ClInclude Include="src\cpp\ripple\UniqueNodeList.h" />
     <ClInclude Include="src\cpp\ripple\utils.h" />

newcoin.vcxproj.filters

@@ -1133,9 +1133,6 @@
     <ClInclude Include="src\cpp\ripple\rfc1751.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\ripple\types.h">
-      <Filter>1. Modules\ripple_basics\types</Filter>
-    </ClInclude>
     <ClInclude Include="src\cpp\ripple\utils.h">
       <Filter>1. Modules\ripple_basics\types</Filter>
     </ClInclude>
@@ -1364,6 +1361,9 @@
     <ClInclude Include="build\proto\ripple.pb.h">
       <Filter>1. Modules\ripple_basics\protobuf</Filter>
     </ClInclude>
+    <ClInclude Include="src\cpp\ripple\IntegerTypes.h">
+      <Filter>1. Modules\ripple_basics\types</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="wallet.xml" />

src/cpp/database/database.h

@@ -3,7 +3,6 @@
 
 #include <string>
 #include <vector>
-#include "../ripple/types.h"
 #include "../ripple/utils.h"
 
 #define SQL_FOREACH(_db, _strQuery)		\

src/cpp/ripple/AccountState.h

@@ -11,7 +11,6 @@
 
 #include "../json/value.h"
 
-#include "types.h"
 #include "RippleAddress.h"
 #include "SerializedLedger.h"
 

src/cpp/ripple/BitcoinUtil.h

@@ -4,7 +4,6 @@
 // TODO: these things should all go somewhere
 
 #include <string>
-#include "types.h"
 #include "uint256.h"
 #include <openssl/ripemd.h>
 #include <openssl/sha.h>

src/cpp/ripple/Config.h

@@ -6,7 +6,6 @@
 #include <boost/asio/ssl.hpp>
 #include <boost/filesystem.hpp>
 
-#include "types.h"
 #include "RippleAddress.h"
 #include "ParseSection.h"
 #include "SerializedTypes.h"

src/cpp/ripple/ConnectionPool.h

@@ -8,7 +8,6 @@
 
 #include "Peer.h"
 #include "PackedMessage.h"
-#include "types.h"
 
 //
 // Access to the Ripple network.

src/cpp/ripple/HashPrefixes.h

@@ -1,7 +1,6 @@
 #ifndef __HASHPREFIXES__
 #define __HASHPREFIXES__
 
-#include "types.h"
 
 // TXN - Hash of transaction plus signature to give transaction ID
 const uint32 sHP_TransactionID =	0x54584E00;

src/cpp/ripple/HashedObject.h

@@ -6,7 +6,6 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/condition_variable.hpp>
 
-#include "types.h"
 #include "uint256.h"
 #include "ScopedLock.h"
 #include "TaggedCache.h"

src/cpp/ripple/IntegerTypes.h

@@ -1,8 +1,8 @@
-#ifndef __TYPES_HH__
+#ifndef INTEGERTYPES_H
-#define __TYPES_HH__
+#define INTEGERTYPES_H
-
-#if defined(_MSC_VER) || defined(__BORLANDC__)
 
+// VFALCO: TODO, determine if Borland C is supported
+#if defined (_MSC_VER) /*|| defined(__BORLANDC__)*/
 typedef __int64  int64;
 typedef unsigned __int64  uint64;
 typedef unsigned int uint32;
@@ -10,7 +10,6 @@ typedef unsigned short int uint16;
 typedef int int32;
 
 #else
-
 typedef long long  int64;
 typedef unsigned long long  uint64;
 typedef unsigned int uint32;
@@ -18,8 +17,13 @@ typedef unsigned short int uint16;
 typedef int int32;
 
 #endif
+
+// VFALCO: TODO, make sure minimum VS version is 9, 10, or 11
+// If commenting this out creates a problem, contact me!
+/*
 #if defined(_MSC_VER) && _MSC_VER < 1300
 #define for  if (false) ; else for
 #endif
+*/
 
 #endif

src/cpp/ripple/JobQueue.h

@@ -13,7 +13,6 @@
 
 #include "../json/value.h"
 
-#include "types.h"
 #include "LoadMonitor.h"
 
 // Note that this queue should only be used for CPU-bound jobs

src/cpp/ripple/Ledger.h

@@ -14,7 +14,6 @@
 #include "TransactionMeta.h"
 #include "AccountState.h"
 #include "NicknameState.h"
-#include "types.h"
 #include "BitcoinUtil.h"
 #include "SHAMap.h"
 #include "InstanceCounter.h"

src/cpp/ripple/LedgerMaster.h

@@ -4,7 +4,6 @@
 #include "Ledger.h"
 #include "LedgerHistory.h"
 #include "Peer.h"
-#include "types.h"
 #include "LedgerAcquire.h"
 #include "Transaction.h"
 #include "TransactionEngine.h"

src/cpp/ripple/LoadManager.h

@@ -7,7 +7,6 @@
 
 #include "../json/value.h"
 
-#include "types.h"
 
 extern int upTime();
 

src/cpp/ripple/LoadMonitor.h

@@ -7,7 +7,6 @@
 #include <boost/shared_ptr.hpp>
 
 #include "utils.h"
-#include "types.h"
 
 extern int upTime();
 

src/cpp/ripple/Log.h

@@ -21,8 +21,6 @@ namespace boost {
 // Ensure that we don't get value.h without writer.h
 #include "../json/json.h"
 
-#include "types.h"
-
 enum LogSeverity
 {
 	lsINVALID	= -1,	// used to indicate an invalid severity

src/cpp/ripple/RangeSet.h

@@ -7,7 +7,6 @@
 #include <boost/foreach.hpp>
 #include <boost/icl/interval_set.hpp>
 
-#include "types.h"
 
 class RangeSet
 {

src/cpp/ripple/SHAMap.h

@@ -9,7 +9,6 @@
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/unordered_map.hpp>
 
-#include "types.h"
 #include "uint256.h"
 #include "ScopedLock.h"
 #include "Serializer.h"

src/cpp/ripple/SNTPClient.h

@@ -9,8 +9,6 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/asio.hpp>
 
-#include "types.h"
-
 class SNTPQuery
 {
 public:

src/cpp/ripple/Suppression.h

@@ -9,7 +9,6 @@
 #include <boost/thread/mutex.hpp>
 
 #include "uint256.h"
-#include "types.h"
 #include "InstanceCounter.h"
 
 DEFINE_INSTANCE(Suppression);

src/cpp/ripple/ValidationCollection.h

@@ -7,7 +7,6 @@
 #include <boost/thread/mutex.hpp>
 
 #include "uint256.h"
-#include "types.h"
 #include "SerializedValidation.h"
 #include "TaggedCache.h"
 #include "JobQueue.h"

src/cpp/ripple/uint256.h

@@ -15,7 +15,6 @@
 
 #include <boost/functional/hash.hpp>
 
-#include "types.h"
 #include "utils.h"
 
 #if defined(_MSC_VER) && _MSC_VER < 1300

src/cpp/ripple/utils.h

@@ -10,7 +10,6 @@
 #endif
 
 #include <openssl/dh.h>
-#include "types.h"
 
 #define QUALITY_ONE			1000000000	// 10e9