commit a7846b39b055212c08334de7a9834b06112f5cc4
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 06:05:15 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 06:05:30 2021 -0500
tree 2e539ca498d6d62be036460a5b25e2b85ca0e76e
parent 6dd1c2ad86507202dd55c533559e253f846e99c8

cleanup sdbus CAMELCASE define

The transition from e129be3b566a187f42e4ab45bccfb10d35dc3d71 is
complete, so clean up the old defines.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ia1570296370970999171cfa7c2c3aa7b16a8f32e

bmc-vmi-ca/ca_cert_entry.hpp

diff --git a/bmc-vmi-ca/ca_cert_entry.hpp b/bmc-vmi-ca/ca_cert_entry.hpp
index ad7ffce..174daba 100644
--- a/bmc-vmi-ca/ca_cert_entry.hpp
+++ b/bmc-vmi-ca/ca_cert_entry.hpp
@@ -50,11 +50,7 @@
         bus(bus), id(entryId), manager(manager)
 
     {
-#ifdef SDBUSPP_NEW_CAMELCASE
         this->csr(csr);
-#else
-        cSR(csr);
-#endif
         clientCertificate(cert);
 
         // Emit deferred signal.

csr.cpp

diff --git a/csr.cpp b/csr.cpp
index 556f09a..dc26522 100644
--- a/csr.cpp
+++ b/csr.cpp
@@ -32,11 +32,7 @@
     this->emit_object_added();
 }
 
-#ifdef SDBUSPP_NEW_CAMELCASE
 std::string CSR::csr()
-#else
-std::string CSR::cSR()
-#endif
 {
     if (csrStatus == Status::FAILURE)
     {

csr.hpp

diff --git a/csr.hpp b/csr.hpp
index 45ebf00..c6b4221 100644
--- a/csr.hpp
+++ b/csr.hpp
@@ -39,11 +39,7 @@
         CertInstallPath&& installPath, const Status& status);
     /** @brief Return CSR
      */
-#ifdef SDBUSPP_NEW_CAMELCASE
     std::string csr() override;
-#else
-    std::string cSR() override;
-#endif
 
   private:
     /** @brief sdbusplus handler */

test/certs_manager_test.cpp

diff --git a/test/certs_manager_test.cpp b/test/certs_manager_test.cpp
index 6244359..4ffa667 100644
--- a/test/certs_manager_test.cpp
+++ b/test/certs_manager_test.cpp
@@ -176,17 +176,10 @@
             keyCurveId, keyPairAlgorithm, keyUsage, organization,
             organizationalUnit, state, surname, unstructuredName));
     }
-#ifdef SDBUSPP_NEW_CAMELCASE
     std::string csr()
     {
         return (csr_->csr());
     }
-#else
-    std::string cSR()
-    {
-        return (csr_->cSR());
-    }
-#endif
     phosphor::certs::Manager* manager;
     phosphor::certs::CSR* csr_;
 };
@@ -903,11 +896,7 @@
         {
             try
             {
-#ifdef SDBUSPP_NEW_CAMELCASE
                 csrData = csr.csr();
-#else
-                csrData = csr.cSR();
-#endif
             }
             catch (const InternalFailure& e)
             {
@@ -919,11 +908,7 @@
     sleep(10);
     EXPECT_TRUE(fs::exists(CSRPath));
     EXPECT_TRUE(fs::exists(privateKeyPath));
-#ifdef SDBUSPP_NEW_CAMELCASE
     csrData = csr.csr();
-#else
-    csrData = csr.cSR();
-#endif
     ASSERT_NE("", csrData.c_str());
 }