Skip to content

Commit 2be1395

Browse files
JustinPriviteraJustinPrivitera
committed
fix merge damage
1 parent 03f7080 commit 2be1395

2 files changed

Lines changed: 0 additions & 401 deletions

File tree

‎src/libs/conduit/conduit_data_accessor.cpp‎

Lines changed: 0 additions & 276 deletions
Original file line numberDiff line numberDiff line change
@@ -1115,282 +1115,6 @@ DataAccessor<T>::set(const DataArray<float64> &values)
11151115
}
11161116
}
11171117

1118-
//---------------------------------------------------------------------------//
1119-
//***************************************************************************//
1120-
// Set from DataAccessor
1121-
//***************************************************************************//
1122-
//---------------------------------------------------------------------------//
1123-
1124-
//---------------------------------------------------------------------------//
1125-
// Set from DataAccessor signed integers
1126-
//---------------------------------------------------------------------------//
1127-
1128-
//---------------------------------------------------------------------------//
1129-
template <typename T>
1130-
void
1131-
DataAccessor<T>::set(const DataAccessor<int8> &values)
1132-
{
1133-
index_t num_elems = dtype().number_of_elements();
1134-
for(index_t i=0; i <num_elems; i++)
1135-
{
1136-
this->set(i, (T)values[i]);
1137-
}
1138-
}
1139-
1140-
//---------------------------------------------------------------------------//
1141-
template <typename T>
1142-
void
1143-
DataAccessor<T>::set(const DataAccessor<int16> &values)
1144-
{
1145-
index_t num_elems = dtype().number_of_elements();
1146-
for(index_t i=0; i <num_elems; i++)
1147-
{
1148-
this->set(i, (T)values[i]);
1149-
}
1150-
}
1151-
1152-
//---------------------------------------------------------------------------//
1153-
template <typename T>
1154-
void
1155-
DataAccessor<T>::set(const DataAccessor<int32> &values)
1156-
{
1157-
index_t num_elems = dtype().number_of_elements();
1158-
for(index_t i=0; i <num_elems; i++)
1159-
{
1160-
this->set(i, (T)values[i]);
1161-
}
1162-
}
1163-
1164-
//---------------------------------------------------------------------------//
1165-
template <typename T>
1166-
void
1167-
DataAccessor<T>::set(const DataAccessor<int64> &values)
1168-
{
1169-
index_t num_elems = dtype().number_of_elements();
1170-
for(index_t i=0; i <num_elems; i++)
1171-
{
1172-
this->set(i, (T)values[i]);
1173-
}
1174-
}
1175-
1176-
//---------------------------------------------------------------------------//
1177-
// Set from DataAccessor unsigned integers
1178-
//---------------------------------------------------------------------------//
1179-
1180-
//---------------------------------------------------------------------------//
1181-
template <typename T>
1182-
void
1183-
DataAccessor<T>::set(const DataAccessor<uint8> &values)
1184-
{
1185-
index_t num_elems = dtype().number_of_elements();
1186-
for(index_t i=0; i <num_elems; i++)
1187-
{
1188-
this->set(i, (T)values[i]);
1189-
}
1190-
}
1191-
1192-
//---------------------------------------------------------------------------//
1193-
template <typename T>
1194-
void
1195-
DataAccessor<T>::set(const DataAccessor<uint16> &values)
1196-
{
1197-
index_t num_elems = dtype().number_of_elements();
1198-
for(index_t i=0; i <num_elems; i++)
1199-
{
1200-
this->set(i, (T)values[i]);
1201-
}
1202-
}
1203-
1204-
//---------------------------------------------------------------------------//
1205-
template <typename T>
1206-
void
1207-
DataAccessor<T>::set(const DataAccessor<uint32> &values)
1208-
{
1209-
index_t num_elems = dtype().number_of_elements();
1210-
for(index_t i=0; i <num_elems; i++)
1211-
{
1212-
this->set(i, (T)values[i]);
1213-
}
1214-
}
1215-
1216-
//---------------------------------------------------------------------------//
1217-
template <typename T>
1218-
void
1219-
DataAccessor<T>::set(const DataAccessor<uint64> &values)
1220-
{
1221-
index_t num_elems = dtype().number_of_elements();
1222-
for(index_t i=0; i <num_elems; i++)
1223-
{
1224-
this->set(i, (T)values[i]);
1225-
}
1226-
}
1227-
1228-
//---------------------------------------------------------------------------//
1229-
// Set from DataAccessor floating point
1230-
//---------------------------------------------------------------------------//
1231-
1232-
//---------------------------------------------------------------------------//
1233-
template <typename T>
1234-
void
1235-
DataAccessor<T>::set(const DataAccessor<float32> &values)
1236-
{
1237-
index_t num_elems = dtype().number_of_elements();
1238-
for(index_t i=0; i <num_elems; i++)
1239-
{
1240-
this->set(i, (T)values[i]);
1241-
}
1242-
}
1243-
1244-
//---------------------------------------------------------------------------//
1245-
template <typename T>
1246-
void
1247-
DataAccessor<T>::set(const DataAccessor<float64> &values)
1248-
{
1249-
index_t num_elems = dtype().number_of_elements();
1250-
for(index_t i=0; i <num_elems; i++)
1251-
{
1252-
this->set(i, (T)values[i]);
1253-
}
1254-
}
1255-
1256-
//---------------------------------------------------------------------------//
1257-
//***************************************************************************//
1258-
// Set from DataArray
1259-
//***************************************************************************//
1260-
//---------------------------------------------------------------------------//
1261-
1262-
//---------------------------------------------------------------------------//
1263-
// Set from DataArray signed integers
1264-
//---------------------------------------------------------------------------//
1265-
1266-
//---------------------------------------------------------------------------//
1267-
template <typename T>
1268-
void
1269-
DataAccessor<T>::set(const DataArray<int8> &values)
1270-
{
1271-
index_t num_elems = dtype().number_of_elements();
1272-
for(index_t i=0; i <num_elems; i++)
1273-
{
1274-
this->set(i, (T)values[i]);
1275-
}
1276-
}
1277-
1278-
//---------------------------------------------------------------------------//
1279-
template <typename T>
1280-
void
1281-
DataAccessor<T>::set(const DataArray<int16> &values)
1282-
{
1283-
index_t num_elems = dtype().number_of_elements();
1284-
for(index_t i=0; i <num_elems; i++)
1285-
{
1286-
this->set(i, (T)values[i]);
1287-
}
1288-
}
1289-
1290-
//---------------------------------------------------------------------------//
1291-
template <typename T>
1292-
void
1293-
DataAccessor<T>::set(const DataArray<int32> &values)
1294-
{
1295-
index_t num_elems = dtype().number_of_elements();
1296-
for(index_t i=0; i <num_elems; i++)
1297-
{
1298-
this->set(i, (T)values[i]);
1299-
}
1300-
}
1301-
1302-
//---------------------------------------------------------------------------//
1303-
template <typename T>
1304-
void
1305-
DataAccessor<T>::set(const DataArray<int64> &values)
1306-
{
1307-
index_t num_elems = dtype().number_of_elements();
1308-
for(index_t i=0; i <num_elems; i++)
1309-
{
1310-
this->set(i, (T)values[i]);
1311-
}
1312-
}
1313-
1314-
//---------------------------------------------------------------------------//
1315-
// Set from DataArray unsigned integers
1316-
//---------------------------------------------------------------------------//
1317-
1318-
//---------------------------------------------------------------------------//
1319-
template <typename T>
1320-
void
1321-
DataAccessor<T>::set(const DataArray<uint8> &values)
1322-
{
1323-
index_t num_elems = dtype().number_of_elements();
1324-
for(index_t i=0; i <num_elems; i++)
1325-
{
1326-
this->set(i, (T)values[i]);
1327-
}
1328-
}
1329-
1330-
//---------------------------------------------------------------------------//
1331-
template <typename T>
1332-
void
1333-
DataAccessor<T>::set(const DataArray<uint16> &values)
1334-
{
1335-
index_t num_elems = dtype().number_of_elements();
1336-
for(index_t i=0; i <num_elems; i++)
1337-
{
1338-
this->set(i, (T)values[i]);
1339-
}
1340-
}
1341-
1342-
//---------------------------------------------------------------------------//
1343-
template <typename T>
1344-
void
1345-
DataAccessor<T>::set(const DataArray<uint32> &values)
1346-
{
1347-
index_t num_elems = dtype().number_of_elements();
1348-
for(index_t i=0; i <num_elems; i++)
1349-
{
1350-
this->set(i, (T)values[i]);
1351-
}
1352-
}
1353-
1354-
//---------------------------------------------------------------------------//
1355-
template <typename T>
1356-
void
1357-
DataAccessor<T>::set(const DataArray<uint64> &values)
1358-
{
1359-
index_t num_elems = dtype().number_of_elements();
1360-
for(index_t i=0; i <num_elems; i++)
1361-
{
1362-
this->set(i, (T)values[i]);
1363-
}
1364-
}
1365-
1366-
//---------------------------------------------------------------------------//
1367-
// Set from DataArray floating point
1368-
//---------------------------------------------------------------------------//
1369-
1370-
//---------------------------------------------------------------------------//
1371-
template <typename T>
1372-
void
1373-
DataAccessor<T>::set(const DataArray<float32> &values)
1374-
{
1375-
index_t num_elems = dtype().number_of_elements();
1376-
for(index_t i=0; i <num_elems; i++)
1377-
{
1378-
this->set(i, (T)values[i]);
1379-
}
1380-
}
1381-
1382-
//---------------------------------------------------------------------------//
1383-
template <typename T>
1384-
void
1385-
DataAccessor<T>::set(const DataArray<float64> &values)
1386-
{
1387-
index_t num_elems = dtype().number_of_elements();
1388-
for(index_t i=0; i <num_elems; i++)
1389-
{
1390-
this->set(i, (T)values[i]);
1391-
}
1392-
}
1393-
13941118

13951119
//---------------------------------------------------------------------------//
13961120
template <typename T>

0 commit comments

Comments
 (0)