Got rid of warnings for underscores in Slice identifiers.

1 files changed, 84 insertions, 84 deletions

diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 278aa6b92f0..1b4e5c92965 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -30,10 +30,10 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     cout << "getting proxies for class hierarchy... " << flush;
-    M_A::C_APrx ca = initial->c_a();
-    M_B::C_BPrx cb = initial->c_b();
-    M_A::C_CPrx cc = initial->c_c();
-    M_A::C_DPrx cd = initial->c_d();
+    MA::CAPrx ca = initial->caop();
+    MB::CBPrx cb = initial->cbop();
+    MA::CCPrx cc = initial->ccop();
+    MA::CDPrx cd = initial->cdop();
     test(ca != cb);
     test(ca != cc);
     test(ca != cd);
@@ -43,10 +43,10 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     cout << "getting proxies for interface hierarchy... " << flush;
-    M_A::I_APrx ia = initial->i_a();
-    M_B::I_B1Prx ib1 = initial->i_b1();
-    M_B::I_B2Prx ib2 = initial->i_b2();
-    M_A::I_CPrx ic = initial->i_c();
+    MA::IAPrx ia = initial->iaop();
+    MB::IB1Prx ib1 = initial->ib1op();
+    MB::IB2Prx ib2 = initial->ib2op();
+    MA::ICPrx ic = initial->icop();
     test(ia != ib1);
     test(ia != ib2);
     test(ia != ic);
@@ -55,167 +55,167 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     cout << "invoking proxy operations on class hierarchy... " << flush;
-    M_A::C_APrx cao;
-    M_B::C_BPrx cbo;
-    M_A::C_CPrx cco;
+    MA::CAPrx cao;
+    MB::CBPrx cbo;
+    MA::CCPrx cco;
 
-    cao = ca->ca(ca);
+    cao = ca->caop(ca);
     test(cao == ca);
-    cao = ca->ca(cb);
+    cao = ca->caop(cb);
     test(cao == cb);
-    cao = ca->ca(cc);
+    cao = ca->caop(cc);
     test(cao == cc);
-    cao = cb->ca(ca);
+    cao = cb->caop(ca);
     test(cao == ca);
-    cao = cb->ca(cb);
+    cao = cb->caop(cb);
     test(cao == cb);
-    cao = cb->ca(cc);
+    cao = cb->caop(cc);
     test(cao == cc);
-    cao = cc->ca(ca);
+    cao = cc->caop(ca);
     test(cao == ca);
-    cao = cc->ca(cb);
+    cao = cc->caop(cb);
     test(cao == cb);
-    cao = cc->ca(cc);
+    cao = cc->caop(cc);
     test(cao == cc);
 
-    cao = cb->cb(cb);
+    cao = cb->cbop(cb);
     test(cao == cb);
-    cbo = cb->cb(cb);
+    cbo = cb->cbop(cb);
     test(cbo == cb);
-    cao = cb->cb(cc);
+    cao = cb->cbop(cc);
     test(cao == cc);
-    cbo = cb->cb(cc);
+    cbo = cb->cbop(cc);
     test(cbo == cc);
-    cao = cc->cb(cb);
+    cao = cc->cbop(cb);
     test(cao == cb);
-    cbo = cc->cb(cb);
+    cbo = cc->cbop(cb);
     test(cbo == cb);
-    cao = cc->cb(cc);
+    cao = cc->cbop(cc);
     test(cao == cc);
-    cbo = cc->cb(cc);
+    cbo = cc->cbop(cc);
     test(cbo == cc);
 
-    cao = cc->cc(cc);
+    cao = cc->ccop(cc);
     test(cao == cc);
-    cbo = cc->cc(cc);
+    cbo = cc->ccop(cc);
     test(cbo == cc);
-    cco = cc->cc(cc);
+    cco = cc->ccop(cc);
     test(cco == cc);
     cout << "ok" << endl;
 
     cout << "ditto, but for interface hierarchy... " << flush;
-    M_A::I_APrx iao;
-    M_B::I_B1Prx ib1o;
-    M_B::I_B2Prx ib2o;
-    M_A::I_CPrx ico;
+    MA::IAPrx iao;
+    MB::IB1Prx ib1o;
+    MB::IB2Prx ib2o;
+    MA::ICPrx ico;
 
-    iao = ia->ia(ia);
+    iao = ia->iaop(ia);
     test(iao == ia);
-    iao = ia->ia(ib1);
+    iao = ia->iaop(ib1);
     test(iao == ib1);
-    iao = ia->ia(ib2);
+    iao = ia->iaop(ib2);
     test(iao == ib2);
-    iao = ia->ia(ic);
+    iao = ia->iaop(ic);
     test(iao == ic);
-    iao = ib1->ia(ia);
+    iao = ib1->iaop(ia);
     test(iao == ia);
-    iao = ib1->ia(ib1);
+    iao = ib1->iaop(ib1);
     test(iao == ib1);
-    iao = ib1->ia(ib2);
+    iao = ib1->iaop(ib2);
     test(iao == ib2);
-    iao = ib1->ia(ic);
+    iao = ib1->iaop(ic);
     test(iao == ic);
-    iao = ib2->ia(ia);
+    iao = ib2->iaop(ia);
     test(iao == ia);
-    iao = ib2->ia(ib1);
+    iao = ib2->iaop(ib1);
     test(iao == ib1);
-    iao = ib2->ia(ib2);
+    iao = ib2->iaop(ib2);
     test(iao == ib2);
-    iao = ib2->ia(ic);
+    iao = ib2->iaop(ic);
     test(iao == ic);
-    iao = ic->ia(ia);
+    iao = ic->iaop(ia);
     test(iao == ia);
-    iao = ic->ia(ib1);
+    iao = ic->iaop(ib1);
     test(iao == ib1);
-    iao = ic->ia(ib2);
+    iao = ic->iaop(ib2);
     test(iao == ib2);
-    iao = ic->ia(ic);
+    iao = ic->iaop(ic);
     test(iao == ic);
 
-    iao = ib1->ib1(ib1);
+    iao = ib1->ib1op(ib1);
     test(iao == ib1);
-    ib1o = ib1->ib1(ib1);
+    ib1o = ib1->ib1op(ib1);
     test(ib1o == ib1);
-    iao = ib1->ib1(ic);
+    iao = ib1->ib1op(ic);
     test(iao == ic);
-    ib1o = ib1->ib1(ic);
+    ib1o = ib1->ib1op(ic);
     test(ib1o == ic);
-    iao = ic->ib1(ib1);
+    iao = ic->ib1op(ib1);
     test(iao == ib1);
-    ib1o = ic->ib1(ib1);
+    ib1o = ic->ib1op(ib1);
     test(ib1o == ib1);
-    iao = ic->ib1(ic);
+    iao = ic->ib1op(ic);
     test(iao == ic);
-    ib1o = ic->ib1(ic);
+    ib1o = ic->ib1op(ic);
     test(ib1o == ic);
 
-    iao = ib2->ib2(ib2);
+    iao = ib2->ib2op(ib2);
     test(iao == ib2);
-    ib2o = ib2->ib2(ib2);
+    ib2o = ib2->ib2op(ib2);
     test(ib2o == ib2);
-    iao = ib2->ib2(ic);
+    iao = ib2->ib2op(ic);
     test(iao == ic);
-    ib2o = ib2->ib2(ic);
+    ib2o = ib2->ib2op(ic);
     test(ib2o == ic);
-    iao = ic->ib2(ib2);
+    iao = ic->ib2op(ib2);
     test(iao == ib2);
-    ib2o = ic->ib2(ib2);
+    ib2o = ic->ib2op(ib2);
     test(ib2o == ib2);
-    iao = ic->ib2(ic);
+    iao = ic->ib2op(ic);
     test(iao == ic);
-    ib2o = ic->ib2(ic);
+    ib2o = ic->ib2op(ic);
     test(ib2o == ic);
 
-    iao = ic->ic(ic);
+    iao = ic->icop(ic);
     test(iao == ic);
-    ib1o = ic->ic(ic);
+    ib1o = ic->icop(ic);
     test(ib1o == ic);
-    ib2o = ic->ic(ic);
+    ib2o = ic->icop(ic);
     test(ib2o == ic);
-    ico = ic->ic(ic);
+    ico = ic->icop(ic);
     test(ico == ic);
 
     cout << "ok" << endl;
 
     cout << "ditto, but for class implementing interfaces... " << flush;
-    M_A::C_DPrx cdo;
+    MA::CDPrx cdo;
 
-    cao = cd->ca(cd);
+    cao = cd->caop(cd);
     test(cao == cd);
-    cbo = cd->cb(cd);
+    cbo = cd->cbop(cd);
     test(cbo == cd);
-    cco = cd->cc(cd);
+    cco = cd->ccop(cd);
     test(cco == cd);
 
-    iao = cd->ia(cd);
+    iao = cd->iaop(cd);
     test(iao == cd);
-    ib1o = cd->ib1(cd);
+    ib1o = cd->ib1op(cd);
     test(ib1o == cd);
-    ib2o = cd->ib2(cd);
+    ib2o = cd->ib2op(cd);
     test(ib2o == cd);
 
-    cao = cd->cd(cd);
+    cao = cd->cdop(cd);
     test(cao == cd);
-    cbo = cd->cd(cd);
+    cbo = cd->cdop(cd);
     test(cbo == cd);
-    cco = cd->cd(cd);
+    cco = cd->cdop(cd);
     test(cco == cd);
 
-    iao = cd->cd(cd);
+    iao = cd->cdop(cd);
     test(iao == cd);
-    ib1o = cd->cd(cd);
+    ib1o = cd->cdop(cd);
     test(ib1o == cd);
-    ib2o = cd->cd(cd);
+    ib2o = cd->cdop(cd);
     test(ib2o == cd);
 
     cout << "ok" << endl;