Skip to content

Commit 63fb0a0

Browse files
silvakidsilvakid
committed
Clean gcc 8 warnings.
1 parent ffa089c commit 63fb0a0

File tree

7 files changed

+67
-67
lines changed

7 files changed

+67
-67
lines changed

‎test/driver_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ static void driver_test_new_driver_exception()
8484
try {
8585
new sql::mysql::MySQL_Driver();
8686
ensure("Exception not thrown", false);
87-
} catch (sql::InvalidArgumentException) { }
87+
} catch (sql::InvalidArgumentException&) { }
8888
}
8989

9090
/* {{{ */

‎test/framework/framework.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
#define TEST_CASE( methodName ) \
6969
RegisterTestCase( new TestCase<TestSuiteClass>( *this, &TestSuiteClass::methodName, #methodName ) )
7070

71-
#define SKIP( message ) TestsListener::setTestExecutionComment( String("SKIP ") + message );\
72-
return
71+
#define SKIP( message ) { TestsListener::setTestExecutionComment( String("SKIP ") + message );\
72+
return; }
7373

7474
#define TODO( message ) TestsListener::setTestExecutionComment( String("TODO ") + message ); throw TestFailedException();
7575

‎test/static_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static void driver_test_new_driver_exception()
6161
try {
6262
// new sql::mysql::MySQL_Driver();
6363
// ensure("Exception not thrown", false);
64-
} catch (sql::InvalidArgumentException) { }
64+
} catch (sql::InvalidArgumentException&) { }
6565
}
6666

6767

‎test/unit/classes/connection.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ void connection::connectUsingMapWrongTypes()
577577
con.reset(driver->connect(connection_properties));
578578
FAIL("No exception I");
579579
}
580-
catch (sql::InvalidArgumentException)
580+
catch (sql::InvalidArgumentException&)
581581
{
582582
/* expected */
583583
}
@@ -591,7 +591,7 @@ void connection::connectUsingMapWrongTypes()
591591
con.reset(driver->connect(connection_properties));
592592
FAIL("No exception II");
593593
}
594-
catch (sql::InvalidArgumentException)
594+
catch (sql::InvalidArgumentException&)
595595
{
596596
/* expected */
597597
}
@@ -605,7 +605,7 @@ void connection::connectUsingMapWrongTypes()
605605
con.reset(driver->connect(connection_properties));
606606
FAIL("No exception III");
607607
}
608-
catch (sql::InvalidArgumentException)
608+
catch (sql::InvalidArgumentException&)
609609
{
610610
/* expected */
611611
}
@@ -619,7 +619,7 @@ void connection::connectUsingMapWrongTypes()
619619
con.reset(driver->connect(connection_properties));
620620
FAIL("No exception IV");
621621
}
622-
catch (sql::InvalidArgumentException)
622+
catch (sql::InvalidArgumentException&)
623623
{
624624
/* expected */
625625
}
@@ -632,7 +632,7 @@ void connection::connectUsingMapWrongTypes()
632632
con.reset(driver->connect(connection_properties));
633633
FAIL("No exception V");
634634
}
635-
catch (sql::InvalidArgumentException)
635+
catch (sql::InvalidArgumentException&)
636636
{
637637
/* expected */
638638
}
@@ -645,7 +645,7 @@ void connection::connectUsingMapWrongTypes()
645645
con.reset(driver->connect(connection_properties));
646646
FAIL("No exception VI");
647647
}
648-
catch (sql::InvalidArgumentException)
648+
catch (sql::InvalidArgumentException&)
649649
{
650650
/* expected */
651651
}
@@ -658,7 +658,7 @@ void connection::connectUsingMapWrongTypes()
658658
con.reset(driver->connect(connection_properties));
659659
FAIL("No exception VII");
660660
}
661-
catch (sql::InvalidArgumentException)
661+
catch (sql::InvalidArgumentException&)
662662
{
663663
/* expected */
664664
}
@@ -671,7 +671,7 @@ void connection::connectUsingMapWrongTypes()
671671
con.reset(driver->connect(connection_properties));
672672
FAIL("No exception VIII");
673673
}
674-
catch (sql::InvalidArgumentException)
674+
catch (sql::InvalidArgumentException&)
675675
{
676676
/* expected */
677677
}
@@ -684,7 +684,7 @@ void connection::connectUsingMapWrongTypes()
684684
con.reset(driver->connect(connection_properties));
685685
FAIL("No exception IX");
686686
}
687-
catch (sql::InvalidArgumentException)
687+
catch (sql::InvalidArgumentException&)
688688
{
689689
/* expected */
690690
}
@@ -697,7 +697,7 @@ void connection::connectUsingMapWrongTypes()
697697
con.reset(driver->connect(connection_properties));
698698
FAIL("No exception X");
699699
}
700-
catch (sql::InvalidArgumentException)
700+
catch (sql::InvalidArgumentException&)
701701
{
702702
/* expected */
703703
}
@@ -710,7 +710,7 @@ void connection::connectUsingMapWrongTypes()
710710
con.reset(driver->connect(connection_properties));
711711
FAIL("No exception XI");
712712
}
713-
catch (sql::InvalidArgumentException)
713+
catch (sql::InvalidArgumentException&)
714714
{
715715
/* expected */
716716
}
@@ -723,7 +723,7 @@ void connection::connectUsingMapWrongTypes()
723723
con.reset(driver->connect(connection_properties));
724724
FAIL("No exception XII");
725725
}
726-
catch (sql::InvalidArgumentException)
726+
catch (sql::InvalidArgumentException&)
727727
{
728728
/* expected */
729729
}
@@ -736,7 +736,7 @@ void connection::connectUsingMapWrongTypes()
736736
con.reset(driver->connect(connection_properties));
737737
FAIL("No exception XIII");
738738
}
739-
catch (sql::InvalidArgumentException)
739+
catch (sql::InvalidArgumentException&)
740740
{
741741
/* expected */
742742
}
@@ -751,7 +751,7 @@ void connection::connectUsingMapWrongTypes()
751751
con.reset(driver->connect(connection_properties));
752752
FAIL("No exception XIV");
753753
}
754-
catch (sql::InvalidArgumentException)
754+
catch (sql::InvalidArgumentException&)
755755
{
756756
expected
757757
}
@@ -765,7 +765,7 @@ void connection::connectUsingMapWrongTypes()
765765
con.reset(driver->connect(connection_properties));
766766
FAIL("No exception XV");
767767
}
768-
catch (sql::InvalidArgumentException)
768+
catch (sql::InvalidArgumentException&)
769769
{
770770
/* expected */
771771
}
@@ -778,7 +778,7 @@ void connection::connectUsingMapWrongTypes()
778778
con.reset(driver->connect(connection_properties));
779779
FAIL("No exception XVI");
780780
}
781-
catch (sql::InvalidArgumentException)
781+
catch (sql::InvalidArgumentException&)
782782
{
783783
/* expected */
784784
}
@@ -791,7 +791,7 @@ void connection::connectUsingMapWrongTypes()
791791
con.reset(driver->connect(connection_properties));
792792
FAIL("No exception XVII");
793793
}
794-
catch (sql::InvalidArgumentException)
794+
catch (sql::InvalidArgumentException&)
795795
{
796796
/* expected */
797797
}
@@ -804,7 +804,7 @@ void connection::connectUsingMapWrongTypes()
804804
con.reset(driver->connect(connection_properties));
805805
FAIL("No exception XVIII");
806806
}
807-
catch (sql::InvalidArgumentException)
807+
catch (sql::InvalidArgumentException&)
808808
{
809809
/* expected */
810810
}
@@ -817,7 +817,7 @@ void connection::connectUsingMapWrongTypes()
817817
con.reset(driver->connect(connection_properties));
818818
FAIL("No exception XIX");
819819
}
820-
catch (sql::InvalidArgumentException)
820+
catch (sql::InvalidArgumentException&)
821821
{
822822
/* expected */
823823
}
@@ -830,7 +830,7 @@ void connection::connectUsingMapWrongTypes()
830830
con.reset(driver->connect(connection_properties));
831831
FAIL("No exception XX");
832832
}
833-
catch (sql::InvalidArgumentException)
833+
catch (sql::InvalidArgumentException&)
834834
{
835835
/* expected */
836836
}
@@ -843,7 +843,7 @@ void connection::connectUsingMapWrongTypes()
843843
con.reset(driver->connect(connection_properties));
844844
FAIL("No exception XXI");
845845
}
846-
catch (sql::InvalidArgumentException)
846+
catch (sql::InvalidArgumentException&)
847847
{
848848
/* expected */
849849
}
@@ -856,7 +856,7 @@ void connection::connectUsingMapWrongTypes()
856856
con.reset(driver->connect(connection_properties));
857857
FAIL("No exception XXII");
858858
}
859-
catch (sql::InvalidArgumentException)
859+
catch (sql::InvalidArgumentException&)
860860
{
861861
/* expected */
862862
}
@@ -869,7 +869,7 @@ void connection::connectUsingMapWrongTypes()
869869
con.reset(driver->connect(connection_properties));
870870
FAIL("No exception XXIII");
871871
}
872-
catch (sql::InvalidArgumentException)
872+
catch (sql::InvalidArgumentException&)
873873
{
874874
/* expected */
875875
}
@@ -882,7 +882,7 @@ void connection::connectUsingMapWrongTypes()
882882
con.reset(driver->connect(connection_properties));
883883
FAIL("No exception XXIV");
884884
}
885-
catch (sql::InvalidArgumentException)
885+
catch (sql::InvalidArgumentException&)
886886
{
887887
/* expected */
888888
}
@@ -895,7 +895,7 @@ void connection::connectUsingMapWrongTypes()
895895
con.reset(driver->connect(connection_properties));
896896
FAIL("No exception XXV");
897897
}
898-
catch (sql::InvalidArgumentException)
898+
catch (sql::InvalidArgumentException&)
899899
{
900900
/* expected */
901901
}
@@ -908,7 +908,7 @@ void connection::connectUsingMapWrongTypes()
908908
con.reset(driver->connect(connection_properties));
909909
FAIL("No exception XXVI");
910910
}
911-
catch (sql::InvalidArgumentException)
911+
catch (sql::InvalidArgumentException&)
912912
{
913913
/* expected */
914914
}
@@ -921,7 +921,7 @@ void connection::connectUsingMapWrongTypes()
921921
con.reset(driver->connect(connection_properties));
922922
FAIL("No exception XXVII");
923923
}
924-
catch (sql::InvalidArgumentException)
924+
catch (sql::InvalidArgumentException&)
925925
{
926926
/* expected */
927927
}
@@ -934,7 +934,7 @@ void connection::connectUsingMapWrongTypes()
934934
con.reset(driver->connect(connection_properties));
935935
FAIL("No exception XXVIII");
936936
}
937-
catch (sql::InvalidArgumentException)
937+
catch (sql::InvalidArgumentException&)
938938
{
939939
/* expected */
940940
}
@@ -947,7 +947,7 @@ void connection::connectUsingMapWrongTypes()
947947
con.reset(driver->connect(connection_properties));
948948
FAIL("No exception XXIX");
949949
}
950-
catch (sql::InvalidArgumentException)
950+
catch (sql::InvalidArgumentException&)
951951
{
952952
/* expected */
953953
}
@@ -960,7 +960,7 @@ void connection::connectUsingMapWrongTypes()
960960
con.reset(driver->connect(connection_properties));
961961
FAIL("No exception XXX");
962962
}
963-
catch (sql::InvalidArgumentException)
963+
catch (sql::InvalidArgumentException&)
964964
{
965965
/* expected */
966966
}
@@ -973,7 +973,7 @@ void connection::connectUsingMapWrongTypes()
973973
con.reset(driver->connect(connection_properties));
974974
FAIL("No exception XXXI - sslVerify");
975975
}
976-
catch (sql::InvalidArgumentException)
976+
catch (sql::InvalidArgumentException&)
977977
{
978978
/* expected */
979979
}
@@ -986,7 +986,7 @@ void connection::connectUsingMapWrongTypes()
986986
con.reset(driver->connect(connection_properties));
987987
FAIL("No exception XXXII - sslCRL");
988988
}
989-
catch (sql::InvalidArgumentException)
989+
catch (sql::InvalidArgumentException&)
990990
{
991991
/* expected */
992992
}
@@ -999,7 +999,7 @@ void connection::connectUsingMapWrongTypes()
999999
con.reset(driver->connect(connection_properties));
10001000
FAIL("No exception XXXIII - sslCRLPath");
10011001
}
1002-
catch (sql::InvalidArgumentException)
1002+
catch (sql::InvalidArgumentException&)
10031003
{
10041004
/* expected */
10051005
}
@@ -1012,7 +1012,7 @@ void connection::connectUsingMapWrongTypes()
10121012
con.reset(driver->connect(connection_properties));
10131013
FAIL("No exception XXXIII - rsaKey");
10141014
}
1015-
catch (sql::InvalidArgumentException)
1015+
catch (sql::InvalidArgumentException&)
10161016
{
10171017
/* expected */
10181018
}
@@ -2912,7 +2912,7 @@ void connection::reconnect()
29122912
res.reset(stmt->executeQuery("SELECT sleep(10);"));
29132913
FAIL("Connection didn't timed out");
29142914
}
2915-
catch (sql::SQLException /*&e*/)
2915+
catch (sql::SQLException &/*e*/)
29162916
{
29172917
ASSERT(con->reconnect());
29182918
res.reset(stmt->executeQuery("SELECT 1;"));
@@ -2950,7 +2950,7 @@ void connection::reconnect()
29502950
res.reset(stmt->executeQuery("SELECT sleep(10);"));
29512951
FAIL("Connection didn't timed out");
29522952
}
2953-
catch (sql::SQLException /*&e*/)
2953+
catch (sql::SQLException &/*e*/)
29542954
{
29552955
ASSERT(con->reconnect());
29562956
res.reset(stmt->executeQuery("SELECT 1;"));

‎test/unit/classes/parametermetadata.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void parametermetadata::getMeta()
6868
pstmt->getParameterMetaData();
6969
FAIL("Closed connection not detected");
7070
}
71-
catch (sql::InvalidInstanceException)
71+
catch (sql::InvalidInstanceException&)
7272
{
7373
}
7474

@@ -99,7 +99,7 @@ void parametermetadata::getParameterCount()
9999
pstmt->getParameterMetaData();
100100
FAIL("Closed connection not detected");
101101
}
102-
catch (sql::InvalidInstanceException)
102+
catch (sql::InvalidInstanceException&)
103103
{
104104
}
105105

0 commit comments

Comments
 (0)