From 1dffaf5d5735e70727acc2a9d67d48c91a8b5a1f Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Wed, 26 Jun 2013 01:10:54 -0700
Subject: [PATCH] Use manual method for naming CountedObject classes

---
 .../ripple_basics/utility/ripple_CountedObject.h   | 14 +-------------
 .../ripple_data/protocol/ripple_SerializedObject.h |  4 ++--
 src/cpp/ripple/Ledger.h                            |  2 +-
 src/cpp/ripple/LedgerProposal.h                    |  2 +-
 src/cpp/ripple/SerializedValidation.h              |  2 +-
 src/cpp/ripple/Transaction.h                       |  2 +-
 src/cpp/ripple/TransactionEngine.h                 |  2 +-
 src/cpp/ripple/WSConnection.h                      |  2 +-
 src/cpp/ripple/ripple_HashRouter.cpp               |  2 +-
 src/cpp/ripple/ripple_HashedObject.h               |  2 +-
 src/cpp/ripple/ripple_InboundLedger.h              |  2 +-
 src/cpp/ripple/ripple_InfoSub.h                    |  2 +-
 src/cpp/ripple/ripple_LedgerConsensus.h            |  2 +-
 src/cpp/ripple/ripple_LedgerEntrySet.h             |  4 ++--
 src/cpp/ripple/ripple_Peer.cpp                     |  2 +-
 src/cpp/ripple/ripple_SHAMap.h                     |  2 +-
 src/cpp/ripple/ripple_SHAMapItem.h                 |  2 +-
 src/cpp/ripple/ripple_SHAMapTreeNode.h             |  2 +-
 src/cpp/ripple/ripple_SerializedLedger.h           |  2 +-
 src/cpp/ripple/ripple_SerializedTransaction.h      |  2 +-
 src/cpp/ripple/ripple_TransactionAcquire.h         |  2 +-
 21 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/modules/ripple_basics/utility/ripple_CountedObject.h b/modules/ripple_basics/utility/ripple_CountedObject.h
index 8aca24a5a5..897eee3507 100644
--- a/modules/ripple_basics/utility/ripple_CountedObject.h
+++ b/modules/ripple_basics/utility/ripple_CountedObject.h
@@ -101,8 +101,6 @@ public:
         getCounter ().decrement ();
     }
 
-    virtual char const* getCountedObjectName () = 0;
-
 private:
     class Counter : public CountedObjects::CounterBase
     {
@@ -111,23 +109,13 @@ private:
 
         char const* getName () const noexcept
         {
-            return getClassName ();
+            return Object::getCountedObjectName ();
         }
 
         void checkPureVirtual () const { }
     };
 
 private:
-    /* Due to a bug in Visual Studio 10 and earlier, the string returned by
-       typeid().name() will appear to leak on exit. Therefore, we should
-       only call this function when there's an actual leak, or else there
-       will be spurious leak notices at exit.
-    */
-    static char const* getClassName () noexcept
-    {
-        return typeid (Object).name ();
-    }
-
     static Counter& getCounter () noexcept
     {
         // VFALCO TODO Research the thread safety of static initializers
diff --git a/modules/ripple_data/protocol/ripple_SerializedObject.h b/modules/ripple_data/protocol/ripple_SerializedObject.h
index 7fd24396e0..0e8bd79bec 100644
--- a/modules/ripple_data/protocol/ripple_SerializedObject.h
+++ b/modules/ripple_data/protocol/ripple_SerializedObject.h
@@ -12,7 +12,7 @@ class STObject
     , public CountedObject <STObject>
 {
 public:
-    char const* getCountedObjectName () { return "STObject"; }
+    static char const* getCountedObjectName () { return "STObject"; }
 
     STObject () : mType (NULL)
     {
@@ -325,7 +325,7 @@ class STArray
     , public CountedObject <STArray>
 {
 public:
-    char const* getCountedObjectName () { return "STArray"; }
+    static char const* getCountedObjectName () { return "STArray"; }
 
     typedef boost::ptr_vector<STObject>                         vector;
     typedef boost::ptr_vector<STObject>::iterator               iterator;
diff --git a/src/cpp/ripple/Ledger.h b/src/cpp/ripple/Ledger.h
index 22a97babb6..7144355685 100644
--- a/src/cpp/ripple/Ledger.h
+++ b/src/cpp/ripple/Ledger.h
@@ -41,7 +41,7 @@ class Ledger
     , public CountedObject <Ledger>
 {
 public:
-    char const* getCountedObjectName () { return "Ledger"; }
+    static char const* getCountedObjectName () { return "Ledger"; }
 
     typedef boost::shared_ptr<Ledger>           pointer;
     typedef const boost::shared_ptr<Ledger>&    ref;
diff --git a/src/cpp/ripple/LedgerProposal.h b/src/cpp/ripple/LedgerProposal.h
index 2e4228bc0c..34b51258ff 100644
--- a/src/cpp/ripple/LedgerProposal.h
+++ b/src/cpp/ripple/LedgerProposal.h
@@ -11,7 +11,7 @@ class LedgerProposal
     : public CountedObject <LedgerProposal>
 {
 public:
-    char const* getCountedObjectName () { return "LedgerProposal"; }
+    static char const* getCountedObjectName () { return "LedgerProposal"; }
 
     static const uint32 seqLeave = 0xffffffff; // leaving the consensus process
 
diff --git a/src/cpp/ripple/SerializedValidation.h b/src/cpp/ripple/SerializedValidation.h
index 67ce0a771b..e4aaed02e0 100644
--- a/src/cpp/ripple/SerializedValidation.h
+++ b/src/cpp/ripple/SerializedValidation.h
@@ -12,7 +12,7 @@ class SerializedValidation
     , public CountedObject <SerializedValidation>
 {
 public:
-    char const* getCountedObjectName () { return "SerializedValidation"; }
+    static char const* getCountedObjectName () { return "SerializedValidation"; }
 
     typedef boost::shared_ptr<SerializedValidation>         pointer;
     typedef const boost::shared_ptr<SerializedValidation>&  ref;
diff --git a/src/cpp/ripple/Transaction.h b/src/cpp/ripple/Transaction.h
index bb40b1ee16..66505c5a7b 100644
--- a/src/cpp/ripple/Transaction.h
+++ b/src/cpp/ripple/Transaction.h
@@ -32,7 +32,7 @@ class Transaction
     , public CountedObject <Transaction>
 {
 public:
-    char const* getCountedObjectName () { return "Transaction"; }
+    static char const* getCountedObjectName () { return "Transaction"; }
 
     typedef boost::shared_ptr<Transaction> pointer;
     typedef const pointer& ref;
diff --git a/src/cpp/ripple/TransactionEngine.h b/src/cpp/ripple/TransactionEngine.h
index 6cb63832e8..d643811c63 100644
--- a/src/cpp/ripple/TransactionEngine.h
+++ b/src/cpp/ripple/TransactionEngine.h
@@ -16,7 +16,7 @@ class TransactionEngine
     : public CountedObject <TransactionEngine>
 {
 public:
-    char const* getCountedObjectName () { return "TransactionEngine"; }
+    static char const* getCountedObjectName () { return "TransactionEngine"; }
 
 private:
     LedgerEntrySet      mNodes;
diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h
index 9b0da61e05..29011e668b 100644
--- a/src/cpp/ripple/WSConnection.h
+++ b/src/cpp/ripple/WSConnection.h
@@ -24,7 +24,7 @@ class WSConnection
     , public CountedObject <WSConnection <endpoint_type> >
 {
 public:
-    char const* getCountedObjectName () { return "WSConnection"; }
+    static char const* getCountedObjectName () { return "WSConnection"; }
 
     typedef typename endpoint_type::connection_type connection;
     typedef typename boost::shared_ptr<connection> connection_ptr;
diff --git a/src/cpp/ripple/ripple_HashRouter.cpp b/src/cpp/ripple/ripple_HashRouter.cpp
index 5772aaedcf..c11c824e1e 100644
--- a/src/cpp/ripple/ripple_HashRouter.cpp
+++ b/src/cpp/ripple/ripple_HashRouter.cpp
@@ -13,7 +13,7 @@ private:
     class Entry : public CountedObject <Entry>
     {
     public:
-        char const* getCountedObjectName () { return "HashRouterEntry"; }
+        static char const* getCountedObjectName () { return "HashRouterEntry"; }
 
         Entry ()
             : mFlags (0)
diff --git a/src/cpp/ripple/ripple_HashedObject.h b/src/cpp/ripple/ripple_HashedObject.h
index 4162a7cb36..0134af07dc 100644
--- a/src/cpp/ripple/ripple_HashedObject.h
+++ b/src/cpp/ripple/ripple_HashedObject.h
@@ -36,7 +36,7 @@ class HashedObject
     : public CountedObject <HashedObject>
 {
 public:
-    char const* getCountedObjectName () { return "HashedObject"; }
+    static char const* getCountedObjectName () { return "HashedObject"; }
 
     typedef boost::shared_ptr <HashedObject> pointer;
     typedef pointer const& ref;
diff --git a/src/cpp/ripple/ripple_InboundLedger.h b/src/cpp/ripple/ripple_InboundLedger.h
index bc902a661f..b5327ffa4f 100644
--- a/src/cpp/ripple/ripple_InboundLedger.h
+++ b/src/cpp/ripple/ripple_InboundLedger.h
@@ -15,7 +15,7 @@ class InboundLedger
     , public CountedObject <InboundLedger>
 {
 public:
-    char const* getCountedObjectName () { return "InboundLedger"; }
+    static char const* getCountedObjectName () { return "InboundLedger"; }
 
     typedef boost::shared_ptr <InboundLedger> pointer;
 
diff --git a/src/cpp/ripple/ripple_InfoSub.h b/src/cpp/ripple/ripple_InfoSub.h
index 11439817af..2aa6fa464b 100644
--- a/src/cpp/ripple/ripple_InfoSub.h
+++ b/src/cpp/ripple/ripple_InfoSub.h
@@ -16,7 +16,7 @@ class InfoSub
     : public CountedObject <InfoSub>
 {
 public:
-    char const* getCountedObjectName () { return "InfoSub"; }
+    static char const* getCountedObjectName () { return "InfoSub"; }
 
     typedef boost::shared_ptr<InfoSub>          pointer;
 
diff --git a/src/cpp/ripple/ripple_LedgerConsensus.h b/src/cpp/ripple/ripple_LedgerConsensus.h
index 4c4f74aa51..30f4eca983 100644
--- a/src/cpp/ripple/ripple_LedgerConsensus.h
+++ b/src/cpp/ripple/ripple_LedgerConsensus.h
@@ -17,7 +17,7 @@ class LedgerConsensus
     , public CountedObject <LedgerConsensus>
 {
 public:
-    char const* getCountedObjectName () { return "LedgerConsensus"; }
+    static char const* getCountedObjectName () { return "LedgerConsensus"; }
 
     LedgerConsensus (LedgerHash const & prevLCLHash, Ledger::ref previousLedger, uint32 closeTime);
 
diff --git a/src/cpp/ripple/ripple_LedgerEntrySet.h b/src/cpp/ripple/ripple_LedgerEntrySet.h
index 6bc750f8d9..6f1d9be64a 100644
--- a/src/cpp/ripple/ripple_LedgerEntrySet.h
+++ b/src/cpp/ripple/ripple_LedgerEntrySet.h
@@ -36,7 +36,7 @@ class LedgerEntrySetEntry
     : public CountedObject <LedgerEntrySetEntry>
 {
 public:
-    char const* getCountedObjectName () { return "LedgerEntrySetEntry"; }
+    static char const* getCountedObjectName () { return "LedgerEntrySetEntry"; }
 
     SLE::pointer        mEntry;
     LedgerEntryAction   mAction;
@@ -62,7 +62,7 @@ class LedgerEntrySet
     : public CountedObject <LedgerEntrySet>
 {
 public:
-    char const* getCountedObjectName () { return "LedgerEntrySet"; }
+    static char const* getCountedObjectName () { return "LedgerEntrySet"; }
 
     LedgerEntrySet (Ledger::ref ledger, TransactionEngineParams tep, bool immutable = false) :
         mLedger (ledger), mParams (tep), mSeq (0), mImmutable (immutable)
diff --git a/src/cpp/ripple/ripple_Peer.cpp b/src/cpp/ripple/ripple_Peer.cpp
index 77b372f0b6..279f4757fe 100644
--- a/src/cpp/ripple/ripple_Peer.cpp
+++ b/src/cpp/ripple/ripple_Peer.cpp
@@ -24,7 +24,7 @@ class PeerImp : public Peer
     , public CountedObject <PeerImp>
 {
 public:
-    char const* getCountedObjectName () { return "Peer"; }
+    static char const* getCountedObjectName () { return "Peer"; }
 
     PeerImp (boost::asio::io_service & io_service,
              boost::asio::ssl::context & ctx,
diff --git a/src/cpp/ripple/ripple_SHAMap.h b/src/cpp/ripple/ripple_SHAMap.h
index c505483245..c71bdfb926 100644
--- a/src/cpp/ripple/ripple_SHAMap.h
+++ b/src/cpp/ripple/ripple_SHAMap.h
@@ -20,7 +20,7 @@ class SHAMap
     : public CountedObject <SHAMap>
 {
 public:
-    char const* getCountedObjectName () { return "SHAMap"; }
+    static char const* getCountedObjectName () { return "SHAMap"; }
 
     typedef boost::shared_ptr<SHAMap> pointer;
     typedef const boost::shared_ptr<SHAMap>& ref;
diff --git a/src/cpp/ripple/ripple_SHAMapItem.h b/src/cpp/ripple/ripple_SHAMapItem.h
index c8759a201b..a7c8e29f70 100644
--- a/src/cpp/ripple/ripple_SHAMapItem.h
+++ b/src/cpp/ripple/ripple_SHAMapItem.h
@@ -12,7 +12,7 @@ class SHAMapItem
     : public CountedObject <SHAMapItem>
 {
 public:
-    char const* getCountedObjectName () { return "SHAMapItem"; }
+    static char const* getCountedObjectName () { return "SHAMapItem"; }
 
     typedef boost::shared_ptr<SHAMapItem>           pointer;
     typedef const boost::shared_ptr<SHAMapItem>&    ref;
diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.h b/src/cpp/ripple/ripple_SHAMapTreeNode.h
index 8034b719bc..2af350e020 100644
--- a/src/cpp/ripple/ripple_SHAMapTreeNode.h
+++ b/src/cpp/ripple/ripple_SHAMapTreeNode.h
@@ -21,7 +21,7 @@ class SHAMapTreeNode
     , public CountedObject <SHAMapTreeNode>
 {
 public:
-    char const* getCountedObjectName () { return "SHAMapTreeNode"; }
+    static char const* getCountedObjectName () { return "SHAMapTreeNode"; }
 
     typedef boost::shared_ptr<SHAMapTreeNode>           pointer;
     typedef const boost::shared_ptr<SHAMapTreeNode>&    ref;
diff --git a/src/cpp/ripple/ripple_SerializedLedger.h b/src/cpp/ripple/ripple_SerializedLedger.h
index fbff0bbf43..c92c3a403f 100644
--- a/src/cpp/ripple/ripple_SerializedLedger.h
+++ b/src/cpp/ripple/ripple_SerializedLedger.h
@@ -27,7 +27,7 @@ class SerializedLedgerEntry
     , public CountedObject <SerializedLedgerEntry>
 {
 public:
-    char const* getCountedObjectName () { return "SerializedLedgerEntry"; }
+    static char const* getCountedObjectName () { return "SerializedLedgerEntry"; }
 
     typedef boost::shared_ptr<SerializedLedgerEntry>        pointer;
     typedef const boost::shared_ptr<SerializedLedgerEntry>& ref;
diff --git a/src/cpp/ripple/ripple_SerializedTransaction.h b/src/cpp/ripple/ripple_SerializedTransaction.h
index c70b73e783..7c2a8e3364 100644
--- a/src/cpp/ripple/ripple_SerializedTransaction.h
+++ b/src/cpp/ripple/ripple_SerializedTransaction.h
@@ -21,7 +21,7 @@ class SerializedTransaction
     , public CountedObject <SerializedTransaction>
 {
 public:
-    char const* getCountedObjectName () { return "SerializedTransaction"; }
+    static char const* getCountedObjectName () { return "SerializedTransaction"; }
 
     typedef boost::shared_ptr<SerializedTransaction>        pointer;
     typedef const boost::shared_ptr<SerializedTransaction>& ref;
diff --git a/src/cpp/ripple/ripple_TransactionAcquire.h b/src/cpp/ripple/ripple_TransactionAcquire.h
index f679dd19aa..de057dd96d 100644
--- a/src/cpp/ripple/ripple_TransactionAcquire.h
+++ b/src/cpp/ripple/ripple_TransactionAcquire.h
@@ -15,7 +15,7 @@ class TransactionAcquire
     , public CountedObject <TransactionAcquire>
 {
 public:
-    char const* getCountedObjectName () { return "TransactionAcquire"; }
+    static char const* getCountedObjectName () { return "TransactionAcquire"; }
 
     typedef boost::shared_ptr<TransactionAcquire> pointer;