Changeset 333


Ignore:
Timestamp:
08/15/13 11:12:41 (6 years ago)
Author:
jls17
Message:
  • few changes to fix or suppress compiler warnings
Location:
branches/work_304
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/work_304/ARInside.cpp

    r329 r333  
    24912491                ARValueStruct value; 
    24922492                value.dataType = AR_DATA_TYPE_CHAR; 
    2493                 value.u.charVal = AR_OVERLAY_CLIENT_MODE_FULL; 
     2493                value.u.charVal = (char*)AR_OVERLAY_CLIENT_MODE_FULL; 
    24942494                if (ARSetSessionConfiguration(&arControl, AR_SESS_CONTROL_PROP_API_OVERLAYGROUP, &value, &arStatus) != AR_RETURN_OK) 
    24952495                        cerr << "SetSessionConfiguration failed: " << GetARStatusError(&arStatus); 
  • branches/work_304/Main.cpp

    r330 r333  
    135135} 
    136136 
    137 char* CMain::GetPlatformString() 
     137const char* CMain::GetPlatformString() const 
    138138{ 
    139139        char* platform; 
  • branches/work_304/Main.h

    r306 r333  
    2828 
    2929private: 
    30         char* GetPlatformString(); 
     30        const char* GetPlatformString() const; 
    3131        void OutputARInsideBanner(); 
    3232 
  • branches/work_304/core/ARProplistHelper.cpp

    r182 r333  
    320320CARProplistHelper::PropHelpData::PropHelpData(void) 
    321321{ 
    322         pId = NULL; 
     322        pId = 0; 
    323323        Value = NULL; 
    324324        isUsed = false; 
  • branches/work_304/lists/ARContainerList.cpp

    r286 r333  
    183183                        ARZeroMemory(&contNames); 
    184184 
    185                         if (ARGetListContainer(&arIn->arControl, NULL, NULL, AR_HIDDEN_INCREMENT, NULL, NULL, &contNames, &status) == AR_RETURN_OK) 
     185                        if (ARGetListContainer(&arIn->arControl, 0, NULL, AR_HIDDEN_INCREMENT, NULL, NULL, &contNames, &status) == AR_RETURN_OK) 
    186186                        { 
    187187                                // create a temporate ARNameList 
  • branches/work_304/lists/AREscalationList.cpp

    r282 r333  
    160160                        ARZeroMemory(&contNames); 
    161161 
    162                         if (ARGetListEscalation(&arIn->arControl, NULL, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
     162                        if (ARGetListEscalation(&arIn->arControl, NULL, 0, NULL, &objectNames, &status) == AR_RETURN_OK) 
    163163                        { 
    164164                                originalObjectNameCount = objectNames.numItems; 
  • branches/work_304/lists/ARMenuList.cpp

    r286 r333  
    8989                memset(&objectNames, 0, sizeof(objectNames)); 
    9090 
    91                 if (ARGetListCharMenu(&arIn->arControl, NULL, 0, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
     91                if (ARGetListCharMenu(&arIn->arControl, 0, NULL, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
    9292                { 
    9393                        originalObjectNameCount = objectNames.numItems; 
  • branches/work_304/lists/ARSchemaList.cpp

    r315 r333  
    125125                memset(&objectNames, 0, sizeof(objectNames)); 
    126126 
    127                 if (ARGetListSchema(&arIn->arControl, NULL, AR_LIST_SCHEMA_ALL | AR_HIDDEN_INCREMENT, NULL, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
     127                if (ARGetListSchema(&arIn->arControl, 0, AR_LIST_SCHEMA_ALL | AR_HIDDEN_INCREMENT, NULL, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
    128128                { 
    129129                        originalObjectNameCount = objectNames.numItems; 
     
    196196                        ARZeroMemory(&valueList); 
    197197 
    198                         if (ARGetListSQL(&arIn->arControl, "select name, timestamp from arschema", 0, &valueList, &numMatches, &status) == AR_RETURN_OK) 
     198                        if (ARGetListSQL(&arIn->arControl, (char*)"select name, timestamp from arschema", 0, &valueList, &numMatches, &status) == AR_RETURN_OK) 
    199199                        { 
    200200                                if (numMatches > 0) 
     
    263263                        memset(&objectNames, 0, sizeof(objectNames)); 
    264264 
    265                         if (ARGetListSchema(&arIn->arControl, NULL, AR_LIST_SCHEMA_ALL | AR_HIDDEN_INCREMENT, NULL, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
     265                        if (ARGetListSchema(&arIn->arControl, 0, AR_LIST_SCHEMA_ALL | AR_HIDDEN_INCREMENT, NULL, NULL, NULL, &objectNames, &status) == AR_RETURN_OK) 
    266266                        { 
    267267                                originalObjectNameCount = objectNames.numItems; 
     
    431431        ARZeroMemory(&valueList);        
    432432 
    433         if (ARGetListSQL(&arIn->arControl, "select schemaId, name, viewName, shViewName from arschema", 0, &valueList, &numMatches, &status) == AR_RETURN_OK) 
     433        if (ARGetListSQL(&arIn->arControl, (char*)"select schemaId, name, viewName, shViewName from arschema", 0, &valueList, &numMatches, &status) == AR_RETURN_OK) 
    434434        { 
    435435                if (numMatches > 0) 
Note: See TracChangeset for help on using the changeset viewer.