external/collada2gltf/patches/drop_tr1_support.patch.1

   1 diff -urN -U 4 COLLADA2GLTF/assetModifiers/GLTFFlipUVModifier.cpp COLLADA2GLTF_/assetModifiers/GLTFFlipUVModifier.cpp
   2 --- COLLADA2GLTF/assetModifiers/GLTFFlipUVModifier.cpp  2014-05-25 11:30:45.116840301 +0200
   3 +++ COLLADA2GLTF_/assetModifiers/GLTFFlipUVModifier.cpp 2014-09-29 14:35:52.315612818 +0200
   4 @@ -25,9 +25,6 @@
   5  #include "GLTFFlipUVModifier.h"
   6
   7  using namespace rapidjson;
   8 -#if __cplusplus <= 199711L
   9 -using namespace std::tr1;
  10 -#endif
  11  using namespace std;
  12
  13  namespace GLTF
  14 diff -urN -U 4 COLLADA2GLTF/COLLADA2GLTFWriter.cpp COLLADA2GLTF_/COLLADA2GLTFWriter.cpp
  15 --- COLLADA2GLTF/COLLADA2GLTFWriter.cpp 2014-05-25 11:30:45.111840284 +0200
  16 +++ COLLADA2GLTF_/COLLADA2GLTFWriter.cpp        2014-09-29 14:35:52.299612815 +0200
  17 @@ -35,9 +35,6 @@
  18  #include <algorithm>
  19
  20
  21 -#if __cplusplus <= 199711L
  22 -using namespace std::tr1;
  23 -#endif
  24  using namespace std;
  25  using namespace COLLADAFW;
  26  using namespace COLLADABU;
  27 diff -urN -U 4 COLLADA2GLTF/convert/animationConverter.cpp COLLADA2GLTF_/convert/animationConverter.cpp
  28 --- COLLADA2GLTF/convert/animationConverter.cpp 2014-05-25 11:30:45.116840301 +0200
  29 +++ COLLADA2GLTF_/convert/animationConverter.cpp        2014-09-29 14:35:52.315612818 +0200
  30 @@ -9,9 +9,6 @@
  31  #include "GLTF-Open3DGC.h"
  32
  33  using namespace rapidjson;
  34 -#if __cplusplus <= 199711L
  35 -using namespace std::tr1;
  36 -#endif
  37  using namespace std;
  38
  39  namespace GLTF
  40 diff -urN -U 4 COLLADA2GLTF/convert/meshConverter.cpp COLLADA2GLTF_/convert/meshConverter.cpp
  41 --- COLLADA2GLTF/convert/meshConverter.cpp      2014-05-25 11:30:45.117840304 +0200
  42 +++ COLLADA2GLTF_/convert/meshConverter.cpp     2014-09-29 14:35:52.311612817 +0200
  43 @@ -23,9 +23,6 @@
  44  //--- X3DGC
  45
  46  using namespace rapidjson;
  47 -#if __cplusplus <= 199711L
  48 -using namespace std::tr1;
  49 -#endif
  50  using namespace std;
  51
  52
  53 diff -urN -U 4 COLLADA2GLTF/extensions/o3dgc-compression/GLTF-Open3DGC.cpp COLLADA2GLTF_/extensions/o3dgc-compression/GLTF-Open3DGC.cpp
  54 --- COLLADA2GLTF/extensions/o3dgc-compression/GLTF-Open3DGC.cpp 2014-05-25 11:30:45.143840389 +0200
  55 +++ COLLADA2GLTF_/extensions/o3dgc-compression/GLTF-Open3DGC.cpp        2014-09-29 14:35:52.299612815 +0200
  56 @@ -40,9 +40,6 @@
  57
  58  using namespace o3dgc;
  59  using namespace rapidjson;
  60 -#if __cplusplus <= 199711L
  61 -using namespace std::tr1;
  62 -#endif
  63  using namespace std;
  64
  65  namespace GLTF
  66 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAccessor.cpp COLLADA2GLTF_/GLTF/GLTFAccessor.cpp
  67 --- COLLADA2GLTF/GLTF/GLTFAccessor.cpp  2014-05-25 11:30:45.111840284 +0200
  68 +++ COLLADA2GLTF_/GLTF/GLTFAccessor.cpp 2014-09-29 14:35:52.307612816 +0200
  69 @@ -27,9 +27,6 @@
  70  #include "GLTF.h"
  71
  72  using namespace rapidjson;
  73 -#if __cplusplus <= 199711L
  74 -using namespace std::tr1;
  75 -#endif
  76  using namespace std;
  77
  78  namespace GLTF
  79 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAnimation.cpp COLLADA2GLTF_/GLTF/GLTFAnimation.cpp
  80 --- COLLADA2GLTF/GLTF/GLTFAnimation.cpp 2014-05-25 11:30:45.112840287 +0200
  81 +++ COLLADA2GLTF_/GLTF/GLTFAnimation.cpp        2014-09-29 14:35:52.311612817 +0200
  82 @@ -28,9 +28,6 @@
  83
  84  using namespace rapidjson;
  85  using namespace rapidjson;
  86 -#if __cplusplus <= 199711L
  87 -using namespace std::tr1;
  88 -#endif
  89  using namespace std;
  90
  91  namespace GLTF
  92 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFAsset.cpp COLLADA2GLTF_/GLTF/GLTFAsset.cpp
  93 --- COLLADA2GLTF/GLTF/GLTFAsset.cpp     2014-05-25 11:30:45.112840287 +0200
  94 +++ COLLADA2GLTF_/GLTF/GLTFAsset.cpp    2014-09-29 14:35:52.307612816 +0200
  95 @@ -7,9 +7,6 @@
  96  #include "geometryHelpers.h"
  97  #include "../shaders/commonProfileShaders.h"
  98
  99 -#if __cplusplus <= 199711L
 100 -using namespace std::tr1;
 101 -#endif
 102  using namespace std;
 103
 104  namespace GLTF
 105 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFBuffer.cpp COLLADA2GLTF_/GLTF/GLTFBuffer.cpp
 106 --- COLLADA2GLTF/GLTF/GLTFBuffer.cpp    2014-05-25 11:30:45.112840287 +0200
 107 +++ COLLADA2GLTF_/GLTF/GLTFBuffer.cpp   2014-09-29 14:35:52.303612815 +0200
 108 @@ -29,9 +29,6 @@
 109
 110  using namespace rapidjson;
 111  using namespace rapidjson;
 112 -#if __cplusplus <= 199711L
 113 -using namespace std::tr1;
 114 -#endif
 115  using namespace std;
 116
 117  namespace GLTF
 118 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFConfig.cpp COLLADA2GLTF_/GLTF/GLTFConfig.cpp
 119 --- COLLADA2GLTF/GLTF/GLTFConfig.cpp    2014-05-25 11:30:45.112840287 +0200
 120 +++ COLLADA2GLTF_/GLTF/GLTFConfig.cpp   2014-09-29 14:35:52.303612815 +0200
 121 @@ -24,9 +24,6 @@
 122  #include "GLTF.h"
 123
 124  using namespace rapidjson;
 125 -#if __cplusplus <= 199711L
 126 -using namespace std::tr1;
 127 -#endif
 128  using namespace std;
 129
 130  namespace GLTF
 131 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFEffect.cpp COLLADA2GLTF_/GLTF/GLTFEffect.cpp
 132 --- COLLADA2GLTF/GLTF/GLTFEffect.cpp    2014-05-25 11:30:45.113840291 +0200
 133 +++ COLLADA2GLTF_/GLTF/GLTFEffect.cpp   2014-09-29 14:35:52.307612816 +0200
 134 @@ -28,9 +28,6 @@
 135  #include "../shaders/commonProfileShaders.h"
 136
 137  using namespace rapidjson;
 138 -#if __cplusplus <= 199711L
 139 -using namespace std::tr1;
 140 -#endif
 141  using namespace std;
 142
 143  namespace GLTF
 144 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFExtraDataHandler.cpp COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.cpp
 145 --- COLLADA2GLTF/GLTF/GLTFExtraDataHandler.cpp  2014-05-25 11:30:45.113840291 +0200
 146 +++ COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.cpp 2014-09-29 14:35:52.299612815 +0200
 147 @@ -8,12 +8,9 @@
 148
 149  #include <vector> //FIXME: this should be included by OpenCOLLADA.
 150  #include "../GLTFOpenCOLLADA.h"
 151 -#include "GLTFExtraDataHandler.h"
 152  #include "GLTF.h"
 153 +#include "GLTFExtraDataHandler.h"
 154
 155 -#if __cplusplus <= 199711L
 156 -using namespace std::tr1;
 157 -#endif
 158  using namespace std;
 159
 160  namespace GLTF
 161 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFExtraDataHandler.h COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.h
 162 --- COLLADA2GLTF/GLTF/GLTFExtraDataHandler.h    2014-05-25 11:30:45.113840291 +0200
 163 +++ COLLADA2GLTF_/GLTF/GLTFExtraDataHandler.h   2014-09-29 14:37:50.127630964 +0200
 164 @@ -6,14 +6,6 @@
 165
 166  #include "COLLADASaxFWLIExtraDataCallbackHandler.h"
 167
 168 -#if (defined(WIN32) || defined(_LIBCPP_VERSION) || __cplusplus > 199711L)
 169 -#include <memory>
 170 -#include <unordered_map>
 171 -#else
 172 -#include <tr1/memory>
 173 -#include <tr1/unordered_map>
 174 -#endif
 175 -
 176  namespace GLTF
 177  {
 178      class JSONObject;
 179 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFExtras.cpp COLLADA2GLTF_/GLTF/GLTFExtras.cpp
 180 --- COLLADA2GLTF/GLTF/GLTFExtras.cpp    2014-05-25 11:30:45.113840291 +0200
 181 +++ COLLADA2GLTF_/GLTF/GLTFExtras.cpp   2014-09-29 14:35:52.303612815 +0200
 182 @@ -24,9 +24,6 @@
 183  #include "GLTF.h"
 184
 185  using namespace rapidjson;
 186 -#if __cplusplus <= 199711L
 187 -using namespace std::tr1;
 188 -#endif
 189  using namespace std;
 190
 191  namespace GLTF
 192 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTF.h COLLADA2GLTF_/GLTF/GLTF.h
 193 --- COLLADA2GLTF/GLTF/GLTF.h    2014-05-25 11:30:45.111840284 +0200
 194 +++ COLLADA2GLTF_/GLTF/GLTF.h   2014-09-29 14:37:33.531629524 +0200
 195 @@ -42,13 +42,8 @@
 196  #include <cstddef>
 197  #include <cstdint>
 198
 199 -#if (defined(WIN32) || defined(_LIBCPP_VERSION) || __cplusplus > 199711L)
 200  #include <memory>
 201  #include <unordered_map>
 202 -#else
 203 -#include <tr1/memory>
 204 -#include <tr1/unordered_map>
 205 -#endif
 206
 207  // RapidJSON headers
 208  #include "prettywriter.h"
 209 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFInputStream.cpp COLLADA2GLTF_/GLTF/GLTFInputStream.cpp
 210 --- COLLADA2GLTF/GLTF/GLTFInputStream.cpp       2014-05-25 11:30:45.113840291 +0200
 211 +++ COLLADA2GLTF_/GLTF/GLTFInputStream.cpp      2014-09-29 14:35:52.299612815 +0200
 212 @@ -23,9 +23,6 @@
 213
 214  #include "GLTF.h"
 215
 216 -#if __cplusplus <= 199711L
 217 -using namespace std::tr1;
 218 -#endif
 219  using namespace std;
 220
 221  namespace GLTF
 222 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFMesh.cpp COLLADA2GLTF_/GLTF/GLTFMesh.cpp
 223 --- COLLADA2GLTF/GLTF/GLTFMesh.cpp      2014-05-25 11:30:45.113840291 +0200
 224 +++ COLLADA2GLTF_/GLTF/GLTFMesh.cpp     2014-09-29 14:35:52.303612815 +0200
 225 @@ -29,9 +29,6 @@
 226  #include "../helpers/geometryHelpers.h"
 227
 228  using namespace rapidjson;
 229 -#if __cplusplus <= 199711L
 230 -using namespace std::tr1;
 231 -#endif
 232  using namespace std;
 233
 234  namespace GLTF
 235 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFOutputStream.cpp COLLADA2GLTF_/GLTF/GLTFOutputStream.cpp
 236 --- COLLADA2GLTF/GLTF/GLTFOutputStream.cpp      2014-05-25 11:30:45.113840291 +0200
 237 +++ COLLADA2GLTF_/GLTF/GLTFOutputStream.cpp     2014-09-29 14:35:52.311612817 +0200
 238 @@ -23,9 +23,6 @@
 239
 240  #include "GLTF.h"
 241
 242 -#if __cplusplus <= 199711L
 243 -using namespace std::tr1;
 244 -#endif
 245  using namespace std;
 246
 247  namespace GLTF
 248 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFPrimitive.cpp COLLADA2GLTF_/GLTF/GLTFPrimitive.cpp
 249 --- COLLADA2GLTF/GLTF/GLTFPrimitive.cpp 2014-05-25 11:30:45.114840294 +0200
 250 +++ COLLADA2GLTF_/GLTF/GLTFPrimitive.cpp        2014-09-29 14:35:52.303612815 +0200
 251 @@ -27,9 +27,6 @@
 252  #include "GLTF.h"
 253
 254  using namespace rapidjson;
 255 -#if __cplusplus <= 199711L
 256 -using namespace std::tr1;
 257 -#endif
 258  using namespace std;
 259
 260  namespace GLTF
 261 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFSkin.cpp COLLADA2GLTF_/GLTF/GLTFSkin.cpp
 262 --- COLLADA2GLTF/GLTF/GLTFSkin.cpp      2014-05-25 11:30:45.114840294 +0200
 263 +++ COLLADA2GLTF_/GLTF/GLTFSkin.cpp     2014-09-29 14:35:52.303612815 +0200
 264 @@ -24,9 +24,6 @@
 265  #include "GLTF.h"
 266
 267  using namespace rapidjson;
 268 -#if __cplusplus <= 199711L
 269 -using namespace std::tr1;
 270 -#endif
 271  using namespace std;
 272
 273  namespace GLTF
 274 diff -urN -U 4 COLLADA2GLTF/GLTF/GLTFWriter.cpp COLLADA2GLTF_/GLTF/GLTFWriter.cpp
 275 --- COLLADA2GLTF/GLTF/GLTFWriter.cpp    2014-05-25 11:30:45.115840297 +0200
 276 +++ COLLADA2GLTF_/GLTF/GLTFWriter.cpp   2014-09-29 14:35:52.307612816 +0200
 277 @@ -29,9 +29,6 @@
 278  #include "GLTFAsset.h"
 279
 280  using namespace rapidjson;
 281 -#if __cplusplus <= 199711L
 282 -using namespace std::tr1;
 283 -#endif
 284  using namespace std;
 285
 286  namespace GLTF
 287 diff -urN -U 4 COLLADA2GLTF/GLTFOpenCOLLADAUtils.cpp COLLADA2GLTF_/GLTFOpenCOLLADAUtils.cpp
 288 --- COLLADA2GLTF/GLTFOpenCOLLADAUtils.cpp       2014-05-25 11:30:45.115840297 +0200
 289 +++ COLLADA2GLTF_/GLTFOpenCOLLADAUtils.cpp      2014-09-29 14:35:52.295612814 +0200
 290 @@ -25,9 +25,6 @@
 291  #include "GLTFOpenCOLLADA.h"
 292  #include "GLTFOpenCOLLADAUtils.h"
 293
 294 -#if __cplusplus <= 199711L
 295 -using namespace std::tr1;
 296 -#endif
 297  using namespace std;
 298
 299  void fillFloatPtrFromOpenCOLLADAMatrix4(const COLLADABU::Math::Matrix4 &matrix, float *m) {
 300 diff -urN -U 4 COLLADA2GLTF/helpers/geometryHelpers.cpp COLLADA2GLTF_/helpers/geometryHelpers.cpp
 301 --- COLLADA2GLTF/helpers/geometryHelpers.cpp    2014-05-25 11:30:45.143840389 +0200
 302 +++ COLLADA2GLTF_/helpers/geometryHelpers.cpp   2014-09-29 14:35:52.291612813 +0200
 303 @@ -27,9 +27,6 @@
 304  #include "geometryHelpers.h"
 305
 306  using namespace rapidjson;
 307 -#if __cplusplus <= 199711L
 308 -using namespace std::tr1;
 309 -#endif
 310  using namespace std;
 311
 312  namespace GLTF
 313 diff -urN -U 4 COLLADA2GLTF/helpers/mathHelpers.cpp COLLADA2GLTF_/helpers/mathHelpers.cpp
 314 --- COLLADA2GLTF/helpers/mathHelpers.cpp        2014-05-25 11:30:45.143840389 +0200
 315 +++ COLLADA2GLTF_/helpers/mathHelpers.cpp       2014-09-29 14:35:52.291612813 +0200
 316 @@ -26,9 +26,6 @@
 317  #include "mathHelpers.h"
 318
 319  using namespace rapidjson;
 320 -#if __cplusplus <= 199711L
 321 -using namespace std::tr1;
 322 -#endif
 323  using namespace std;
 324
 325  namespace GLTF
 326 diff -urN -U 4 COLLADA2GLTF/JSON/JSONArray.cpp COLLADA2GLTF_/JSON/JSONArray.cpp
 327 --- COLLADA2GLTF/JSON/JSONArray.cpp     2014-05-25 11:30:45.115840297 +0200
 328 +++ COLLADA2GLTF_/JSON/JSONArray.cpp    2014-09-29 14:35:52.315612818 +0200
 329 @@ -32,9 +32,6 @@
 330  #include "document.h"
 331
 332  using namespace rapidjson;
 333 -#if __cplusplus <= 199711L
 334 -using namespace std::tr1;
 335 -#endif
 336  using namespace std;
 337
 338  namespace GLTF
 339 diff -urN -U 4 COLLADA2GLTF/JSON/JSONNumber.cpp COLLADA2GLTF_/JSON/JSONNumber.cpp
 340 --- COLLADA2GLTF/JSON/JSONNumber.cpp    2014-05-25 11:30:45.115840297 +0200
 341 +++ COLLADA2GLTF_/JSON/JSONNumber.cpp   2014-09-29 14:35:52.315612818 +0200
 342 @@ -27,9 +27,6 @@
 343  #include "GLTF.h"
 344
 345  using namespace rapidjson;
 346 -#if __cplusplus <= 199711L
 347 -using namespace std::tr1;
 348 -#endif
 349  using namespace std;
 350
 351  namespace GLTF
 352 diff -urN -U 4 COLLADA2GLTF/JSON/JSONObject.cpp COLLADA2GLTF_/JSON/JSONObject.cpp
 353 --- COLLADA2GLTF/JSON/JSONObject.cpp    2014-05-25 11:30:45.116840301 +0200
 354 +++ COLLADA2GLTF_/JSON/JSONObject.cpp   2014-09-29 14:35:52.315612818 +0200
 355 @@ -29,9 +29,6 @@
 356  #include "document.h"
 357
 358  using namespace rapidjson;
 359 -#if __cplusplus <= 199711L
 360 -using namespace std::tr1;
 361 -#endif
 362  using namespace std;
 363
 364
 365 diff -urN -U 4 COLLADA2GLTF/JSON/JSONString.cpp COLLADA2GLTF_/JSON/JSONString.cpp
 366 --- COLLADA2GLTF/JSON/JSONString.cpp    2014-05-25 11:30:45.116840301 +0200
 367 +++ COLLADA2GLTF_/JSON/JSONString.cpp   2014-09-29 14:35:52.315612818 +0200
 368 @@ -30,9 +30,6 @@
 369  #include "GLTF.h"
 370
 371  using namespace std;
 372 -#if __cplusplus <= 199711L
 373 -using namespace std::tr1;
 374 -#endif
 375
 376  namespace GLTF
 377  {
 378 diff -urN -U 4 COLLADA2GLTF/JSON/JSONValue.cpp COLLADA2GLTF_/JSON/JSONValue.cpp
 379 --- COLLADA2GLTF/JSON/JSONValue.cpp     2014-05-25 11:30:45.116840301 +0200
 380 +++ COLLADA2GLTF_/JSON/JSONValue.cpp    2014-09-29 14:35:52.315612818 +0200
 381 @@ -27,9 +27,6 @@
 382  #include "GLTF.h"
 383
 384  using namespace rapidjson;
 385 -#if __cplusplus <= 199711L
 386 -using namespace std::tr1;
 387 -#endif
 388  using namespace std;
 389
 390  namespace GLTF
 391 diff -urN -U 4 COLLADA2GLTF/main.cpp COLLADA2GLTF_/main.cpp
 392 --- COLLADA2GLTF/main.cpp       2014-05-25 11:30:45.143840389 +0200
 393 +++ COLLADA2GLTF_/main.cpp      2014-09-29 14:35:52.295612814 +0200
 394 @@ -41,9 +41,6 @@
 395  #include "JSONObject.h"
 396
 397  using namespace rapidjson;
 398 -#if __cplusplus <= 199711L
 399 -using namespace std::tr1;
 400 -#endif
 401  using namespace std;
 402
 403  #ifndef _CRT_SECURE_NO_WARNINGS