diff options
author | Karl Berry <karl@freefriends.org> | 2012-05-31 00:02:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2012-05-31 00:02:26 +0000 |
commit | 19fc9fd9a26973d87fad437ce549ffaba479df54 (patch) | |
tree | f40a9d2592b3cf827970c8bf54a1eebf9cc8f9c0 /Build/source/utils/asymptote/prc | |
parent | 24b3bac312553b2cc61e94fda581aba311967f5c (diff) |
asy 2.16 sources
git-svn-id: svn://tug.org/texlive/trunk@26734 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/asymptote/prc')
-rw-r--r-- | Build/source/utils/asymptote/prc/oPRCFile.cc | 2 | ||||
-rw-r--r-- | Build/source/utils/asymptote/prc/writePRC.cc | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Build/source/utils/asymptote/prc/oPRCFile.cc b/Build/source/utils/asymptote/prc/oPRCFile.cc index cc4c302209f..b8014544d4a 100644 --- a/Build/source/utils/asymptote/prc/oPRCFile.cc +++ b/Build/source/utils/asymptote/prc/oPRCFile.cc @@ -1099,7 +1099,7 @@ uint32_t oPRCFile::addMaterial(const PRCmaterial &material) else style->color_material_index = material_index; const uint32_t style_index = addStyle(style); - materialMap.insert(make_pair(material,style_index)).first; + materialMap.insert(make_pair(material,style_index)); return style_index; } diff --git a/Build/source/utils/asymptote/prc/writePRC.cc b/Build/source/utils/asymptote/prc/writePRC.cc index ecc6179b36c..9fbbc41013b 100644 --- a/Build/source/utils/asymptote/prc/writePRC.cc +++ b/Build/source/utils/asymptote/prc/writePRC.cc @@ -29,7 +29,7 @@ #include <fstream> #include <sstream> -#ifndef __GNUC__ +#if !defined(__GNUC__) || defined(__clang__) #include <vector> #endif @@ -1292,7 +1292,7 @@ void PRCCompressedFace::serializeCompressedNurbs(PRCbitStream &pbs, double brep const uint32_t number_of_control_point_in_u = degree_in_u + 1; const uint32_t number_of_control_point_in_v = degree_in_v + 1; -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__clang__) PRCVector3d P[number_of_control_point_in_u][number_of_control_point_in_v]; #else vector<vector<PRCVector3d> > P(number_of_control_point_in_u, vector<PRCVector3d>(number_of_control_point_in_v)); @@ -1300,7 +1300,7 @@ void PRCCompressedFace::serializeCompressedNurbs(PRCbitStream &pbs, double brep for(uint32_t i=0;i<number_of_control_point_in_u;i++) for(uint32_t j=0;j<number_of_control_point_in_v;j++) P[i][j] = control_point[i*number_of_control_point_in_v+j]; -#ifdef __GNUC__ +#if defined(__GNUC__) && !defined(__clang__) itriple compressed_control_point[number_of_control_point_in_u][number_of_control_point_in_v]; uint32_t control_point_type[number_of_control_point_in_u][number_of_control_point_in_v]; #else |