瀏覽代碼

HPCC-14380 Fix various c++11 compile warnings

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Gavin Halliday 9 年之前
父節點
當前提交
f65884f2e8
共有 5 個文件被更改,包括 49 次插入49 次删除
  1. 1 1
      common/workunit/wujobq.cpp
  2. 32 32
      esp/bindings/bindutil.cpp
  3. 1 1
      roxie/ccd/ccdserver.cpp
  4. 14 14
      testing/unittests/dalitests.cpp
  5. 1 1
      thorlcr/graph/thgraphmaster.cpp

+ 1 - 1
common/workunit/wujobq.cpp

@@ -1085,7 +1085,7 @@ public:
 
     IPropertyTree *queryClientRootSession(sQueueData &qd)
     {
-        VStringBuffer path("Client[@session=\"%"I64F"d\"]", sessionid);
+        VStringBuffer path("Client[@session=\"%" I64F "d\"]", sessionid);
         IPropertyTree *ret = qd.root->queryPropTree(path.str());
         if (!ret)
         {

+ 32 - 32
esp/bindings/bindutil.cpp

@@ -33,38 +33,38 @@
 #define URL_MAX  512
 
 static const unsigned char charmap[] = {
-    '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007',
-    '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017',
-    '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027',
-    '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037',
-    '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047',
-    '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057',
-    '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067',
-    '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077',
-    '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-    '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-    '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-    '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137',
-    '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147',
-    '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157',
-    '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167',
-    '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177',
-    '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207',
-    '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217',
-    '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-    '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-    '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-    '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-    '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-    '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277',
-    '\300', '\301', '\302', '\303', '\304', '\305', '\306', '\307',
-    '\310', '\311', '\312', '\313', '\314', '\315', '\316', '\317',
-    '\320', '\321', '\322', '\323', '\324', '\325', '\326', '\327',
-    '\330', '\331', '\332', '\333', '\334', '\335', '\336', '\337',
-    '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347',
-    '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357',
-    '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367',
-    '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
+    0000, 0001, 0002, 0003, 0004, 0005, 0006, 0007,
+    0010, 0011, 0012, 0013, 0014, 0015, 0016, 0017,
+    0020, 0021, 0022, 0023, 0024, 0025, 0026, 0027,
+    0030, 0031, 0032, 0033, 0034, 0035, 0036, 0037,
+    0040, 0041, 0042, 0043, 0044, 0045, 0046, 0047,
+    0050, 0051, 0052, 0053, 0054, 0055, 0056, 0057,
+    0060, 0061, 0062, 0063, 0064, 0065, 0066, 0067,
+    0070, 0071, 0072, 0073, 0074, 0075, 0076, 0077,
+    0100, 0141, 0142, 0143, 0144, 0145, 0146, 0147,
+    0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,
+    0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,
+    0170, 0171, 0172, 0133, 0134, 0135, 0136, 0137,
+    0140, 0141, 0142, 0143, 0144, 0145, 0146, 0147,
+    0150, 0151, 0152, 0153, 0154, 0155, 0156, 0157,
+    0160, 0161, 0162, 0163, 0164, 0165, 0166, 0167,
+    0170, 0171, 0172, 0173, 0174, 0175, 0176, 0177,
+    0200, 0201, 0202, 0203, 0204, 0205, 0206, 0207,
+    0210, 0211, 0212, 0213, 0214, 0215, 0216, 0217,
+    0220, 0221, 0222, 0223, 0224, 0225, 0226, 0227,
+    0230, 0231, 0232, 0233, 0234, 0235, 0236, 0237,
+    0240, 0241, 0242, 0243, 0244, 0245, 0246, 0247,
+    0250, 0251, 0252, 0253, 0254, 0255, 0256, 0257,
+    0260, 0261, 0262, 0263, 0264, 0265, 0266, 0267,
+    0270, 0271, 0272, 0273, 0274, 0275, 0276, 0277,
+    0300, 0301, 0302, 0303, 0304, 0305, 0306, 0307,
+    0310, 0311, 0312, 0313, 0314, 0315, 0316, 0317,
+    0320, 0321, 0322, 0323, 0324, 0325, 0326, 0327,
+    0330, 0331, 0332, 0333, 0334, 0335, 0336, 0337,
+    0340, 0341, 0342, 0343, 0344, 0345, 0346, 0347,
+    0350, 0351, 0352, 0353, 0354, 0355, 0356, 0357,
+    0360, 0361, 0362, 0363, 0364, 0365, 0366, 0367,
+    0370, 0371, 0372, 0373, 0374, 0375, 0376, 0377,
 };
 
 unsigned int Utils::hash (register const char *str, register unsigned int len)

+ 1 - 1
roxie/ccd/ccdserver.cpp

@@ -7360,7 +7360,7 @@ public:
 
     static RoxieSortAlgorithm useAlgorithm(const char *algorithmName, unsigned sortFlags)
     {
-        RoxieSortAlgorithm sortAlgorithm;
+        RoxieSortAlgorithm sortAlgorithm = unknownSortAlgorithm;
         if (!algorithmName)
             algorithmName = "";
         if (stricmp(algorithmName, "quicksort")==0)

+ 14 - 14
testing/unittests/dalitests.cpp

@@ -1560,55 +1560,55 @@ public:
         ClusterPartDiskMapSpec map;
         {   // 1: single part file old method
 #define TN "1"
-            removeLogical("test::ftest"TN, user);
+            removeLogical("test::ftest" TN, user);
             Owned<IFileDescriptor> fdesc = createFileDescriptor();
             RemoteFilename rfn;
-            rfn.setRemotePath("//10.150.10.1/c$/thordata/test/ftest"TN"._1_of_1");
+            rfn.setRemotePath("//10.150.10.1/c$/thordata/test/ftest" TN "._1_of_1");
             fdesc->setPart(0,rfn);
             fdesc->endCluster(map);
             Owned<IDistributedFile> file = queryDistributedFileDirectory().createNew(fdesc);
-            file->attach("test::ftest"TN,user);
+            file->attach("test::ftest" TN,user);
 #undef TN
         }
         {   // 2: single part file new method
 #define TN "2"
-            removeLogical("test::ftest"TN, user);
+            removeLogical("test::ftest" TN, user);
             Owned<IFileDescriptor> fdesc = createFileDescriptor();
-            fdesc->setPartMask("ftest"TN"._$P$_of_$N$");
+            fdesc->setPartMask("ftest" TN "._$P$_of_$N$");
             fdesc->setNumParts(1);
             Owned<IGroup> grp = createIGroup("10.150.10.1");
             fdesc->addCluster(grp,map);
             Owned<IDistributedFile> file = queryDistributedFileDirectory().createNew(fdesc);
-            file->attach("test::ftest"TN,user);
+            file->attach("test::ftest" TN,user);
 #undef TN
         }
         Owned<IGroup> grp3 = createIGroup("10.150.10.1,10.150.10.2,10.150.10.3");
         queryNamedGroupStore().add("__testgroup3__",grp3,true);
         {   // 3: three parts file old method
 #define TN "3"
-            removeLogical("test::ftest"TN, user);
+            removeLogical("test::ftest" TN, user);
             Owned<IFileDescriptor> fdesc = createFileDescriptor();
             RemoteFilename rfn;
-            rfn.setRemotePath("//10.150.10.1/c$/thordata/test/ftest"TN"._1_of_3");
+            rfn.setRemotePath("//10.150.10.1/c$/thordata/test/ftest" TN "._1_of_3");
             fdesc->setPart(0,rfn);
-            rfn.setRemotePath("//10.150.10.2/c$/thordata/test/ftest"TN"._2_of_3");
+            rfn.setRemotePath("//10.150.10.2/c$/thordata/test/ftest" TN "._2_of_3");
             fdesc->setPart(1,rfn);
-            rfn.setRemotePath("//10.150.10.3/c$/thordata/test/ftest"TN"._3_of_3");
+            rfn.setRemotePath("//10.150.10.3/c$/thordata/test/ftest" TN "._3_of_3");
             fdesc->setPart(2,rfn);
             fdesc->endCluster(map);
             Owned<IDistributedFile> file = queryDistributedFileDirectory().createNew(fdesc);
-            file->attach("test::ftest"TN,user);
+            file->attach("test::ftest" TN,user);
 #undef TN
         }
         {   // 4: three part file new method
 #define TN "4"
-            removeLogical("test::ftest"TN, user);
+            removeLogical("test::ftest" TN, user);
             Owned<IFileDescriptor> fdesc = createFileDescriptor();
-            fdesc->setPartMask("ftest"TN"._$P$_of_$N$");
+            fdesc->setPartMask("ftest" TN "._$P$_of_$N$");
             fdesc->setNumParts(3);
             fdesc->addCluster(grp3,map);
             Owned<IDistributedFile> file = queryDistributedFileDirectory().createNew(fdesc);
-            file->attach("test::ftest"TN,user);
+            file->attach("test::ftest" TN,user);
 #undef TN
         }
     }

+ 1 - 1
thorlcr/graph/thgraphmaster.cpp

@@ -1344,7 +1344,7 @@ void CJobMaster::broadcast(ICommunicator &comm, CMessageBuffer &msg, mptag_t mpt
 {
     unsigned groupSizeExcludingMaster = comm.queryGroup().ordinality() - 1;
 
-    mptag_t replyTag;
+    mptag_t replyTag = TAG_NULL;
     if (!sendOnly)
     {
         replyTag = queryJobChannel(0).queryMPServer().createReplyTag();