[svn] commit: r396 - /branches/jinmei-dnsmessageapi/src/lib/dns/cpp/name_unittest.cc

[BIND 10 source code commits]

Author: jinmei
Date: Mon Dec 21 20:34:45 2009
New Revision: 396

Log:
addressed compilation problem with some compilers about class static constants

Modified:
    branches/jinmei-dnsmessageapi/src/lib/dns/cpp/name_unittest.cc

Modified: branches/jinmei-dnsmessageapi/src/lib/dns/cpp/name_unittest.cc
==============================================================================
--- branches/jinmei-dnsmessageapi/src/lib/dns/cpp/name_unittest.cc (original)
+++ branches/jinmei-dnsmessageapi/src/lib/dns/cpp/name_unittest.cc Mon Dec 21 20:34:45 2009
@@ -33,6 +33,13 @@
 using isc::dns::OutputBuffer;
 using isc::dns::Name;
 using isc::dns::NameComparisonResult;
+
+//
+// XXX: these are defined as class static constants, but some compilers
+// seemingly cannot find the symbols when used in the EXPECT_xxx macros.
+//
+const size_t isc::dns::Name::MAX_WIRE;
+const size_t isc::dns::Name::MAX_LABELS;
 
 namespace {
 class NameTest : public ::testing::Test {
@@ -50,8 +57,6 @@
     const Name large_name;
     OutputBuffer buffer_actual, buffer_expected;
 
-    static const size_t MAX_WIRE = Name::MAX_WIRE;
-    static const size_t MAX_LABELS = Name::MAX_LABELS;
     //
     // helper methods
     //
@@ -197,7 +202,7 @@
                           "0.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9." // 200
                           "0.1.2.3.4.5.6.7.8.9.0.1.2.3.4.5.6.7.8.9." // 240
                           "0.1.2.3.4.5.6.");
-    EXPECT_EQ(MAX_LABELS, maxlabels.getLabels());
+    EXPECT_EQ(Name::MAX_LABELS, maxlabels.getLabels());
 }
 
 TEST_F(NameTest, fromWire)
@@ -241,14 +246,14 @@
     //
 
     // large names, a long but valid one, and invalid (too long) one.
-    EXPECT_EQ(MAX_WIRE,
+    EXPECT_EQ(Name::MAX_WIRE,
               nameFactoryFromWire("testdata/name_fromWire9", 0).getLength());
     EXPECT_THROW(nameFactoryFromWire("testdata/name_fromWire10", 0).getLength(),
                  isc::dns::TooLongName);
 
     // A name with possible maximum number of labels; awkward but valid
     EXPECT_EQ(nameFactoryFromWire("testdata/name_fromWire11", 0).getLabels(),
-              MAX_LABELS);
+              Name::MAX_LABELS);
 
     // Wire format including an invalid label length
     EXPECT_THROW(nameFactoryFromWire("testdata/name_fromWire12", 0),