Attachment #186323 for bug #220787

View | Details | Raw Unified | Return to bug 220787
Collapse All | Expand All

Lines 26-32 Link Here

(-)b/graphics/aqsis/Makefile (-1 / +3 lines)
26	LDFLAGS+= -L${LOCALBASE}/lib	25	LDFLAGS+= -L${LOCALBASE}/lib
27		26
28	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
29	USES= cmake:outsource desktop-file-utils shared-mime-info shebangfix	28	USES= cmake:outsource compiler:c++11-lib desktop-file-utils \
		29	shared-mime-info shebangfix
		30	USE_CXXSTD= gnu++11
30	SHEBANG_FILES= examples///*.sh \	31	SHEBANG_FILES= examples///*.sh \
31	tools/neqsus/houdini/post.sh \	32	tools/neqsus/houdini/post.sh \
32	distribution/linux/*.sh	33	distribution/linux/*.sh




In file included from libs/tex/filtering/dummytexturesampler.cpp:38:
In file included from libs/tex/filtering/dummytexturesampler.h:41:
In file included from include/aqsis/tex/filtering/itexturesampler.h:46:
include/aqsis/tex/filtering/texturesampleoptions.h:239:31: error: ISO C++11 does not allow access declarations; use using declarations instead
                CqTextureSampleOptionsBase::sBlur;
                                            ^
                using
include/aqsis/tex/filtering/texturesampleoptions.h:240:31: error: ISO C++11 does not allow access declarations; use using declarations instead
                CqTextureSampleOptionsBase::tBlur;
                                            ^
                using
include/aqsis/tex/filtering/texturesampleoptions.h:241:31: error: ISO C++11 does not allow access declarations; use using declarations instead
                CqTextureSampleOptionsBase::sWidth;
                                            ^
                using
[...]

--- include/aqsis/tex/filtering/texturesampleoptions.h.orig	2012-08-24 12:26:50 UTC
+++ include/aqsis/tex/filtering/texturesampleoptions.h
@@ -236,37 +236,37 @@ class CqTextureSampleOptions : private CqTextureSample
 		CqTextureSampleOptions();
 
 		// Accessors from CqTextureSampleOptionsBase
-		CqTextureSampleOptionsBase::sBlur;
-		CqTextureSampleOptionsBase::tBlur;
-		CqTextureSampleOptionsBase::sWidth;
-		CqTextureSampleOptionsBase::tWidth;
-		CqTextureSampleOptionsBase::minWidth;
-		CqTextureSampleOptionsBase::truncAmount;
-		CqTextureSampleOptionsBase::logTruncAmount;
-		CqTextureSampleOptionsBase::filterType;
-		CqTextureSampleOptionsBase::startChannel;
-		CqTextureSampleOptionsBase::numChannels;
-		CqTextureSampleOptionsBase::sWrapMode;
-		CqTextureSampleOptionsBase::tWrapMode;
+		using CqTextureSampleOptionsBase::sBlur;
+		using CqTextureSampleOptionsBase::tBlur;
+		using CqTextureSampleOptionsBase::sWidth;
+		using CqTextureSampleOptionsBase::tWidth;
+		using CqTextureSampleOptionsBase::minWidth;
+		using CqTextureSampleOptionsBase::truncAmount;
+		using CqTextureSampleOptionsBase::logTruncAmount;
+		using CqTextureSampleOptionsBase::filterType;
+		using CqTextureSampleOptionsBase::startChannel;
+		using CqTextureSampleOptionsBase::numChannels;
+		using CqTextureSampleOptionsBase::sWrapMode;
+		using CqTextureSampleOptionsBase::tWrapMode;
 
 		// Modifiers from CqTextureSampleOptionsBase
-		CqTextureSampleOptionsBase::setBlur;
-		CqTextureSampleOptionsBase::setSBlur;
-		CqTextureSampleOptionsBase::setTBlur;
-		CqTextureSampleOptionsBase::setWidth;
-		CqTextureSampleOptionsBase::setSWidth;
-		CqTextureSampleOptionsBase::setTWidth;
-		CqTextureSampleOptionsBase::setMinWidth;
-		CqTextureSampleOptionsBase::setTruncAmount;
-		CqTextureSampleOptionsBase::setFilterType;
-		CqTextureSampleOptionsBase::setStartChannel;
-		CqTextureSampleOptionsBase::setNumChannels;
-		CqTextureSampleOptionsBase::setWrapMode;
-		CqTextureSampleOptionsBase::setSWrapMode;
-		CqTextureSampleOptionsBase::setTWrapMode;
+		using CqTextureSampleOptionsBase::setBlur;
+		using CqTextureSampleOptionsBase::setSBlur;
+		using CqTextureSampleOptionsBase::setTBlur;
+		using CqTextureSampleOptionsBase::setWidth;
+		using CqTextureSampleOptionsBase::setSWidth;
+		using CqTextureSampleOptionsBase::setTWidth;
+		using CqTextureSampleOptionsBase::setMinWidth;
+		using CqTextureSampleOptionsBase::setTruncAmount;
+		using CqTextureSampleOptionsBase::setFilterType;
+		using CqTextureSampleOptionsBase::setStartChannel;
+		using CqTextureSampleOptionsBase::setNumChannels;
+		using CqTextureSampleOptionsBase::setWrapMode;
+		using CqTextureSampleOptionsBase::setSWrapMode;
+		using CqTextureSampleOptionsBase::setTWrapMode;
 
 		// Other stuff from CqTextureSampleOptionsBase
-		CqTextureSampleOptionsBase::fillFromFileHeader;
+		using CqTextureSampleOptionsBase::fillFromFileHeader;
 
 		//--------------------------------------------------
 		// Plain-texture specific sample options
@@ -307,37 +307,37 @@ class CqShadowSampleOptions : private CqTextureSampleO
 		CqShadowSampleOptions();
 
 		// Accessors from CqTextureSampleOptionsBase
-		CqTextureSampleOptionsBase::sBlur;
-		CqTextureSampleOptionsBase::tBlur;
-		CqTextureSampleOptionsBase::sWidth;
-		CqTextureSampleOptionsBase::tWidth;
-		CqTextureSampleOptionsBase::minWidth;
-		CqTextureSampleOptionsBase::truncAmount;
-		CqTextureSampleOptionsBase::logTruncAmount;
-		CqTextureSampleOptionsBase::filterType;
-		CqTextureSampleOptionsBase::startChannel;
-		CqTextureSampleOptionsBase::numChannels;
-		CqTextureSampleOptionsBase::sWrapMode;
-		CqTextureSampleOptionsBase::tWrapMode;
+		using CqTextureSampleOptionsBase::sBlur;
+		using CqTextureSampleOptionsBase::tBlur;
+		using CqTextureSampleOptionsBase::sWidth;
+		using CqTextureSampleOptionsBase::tWidth;
+		using CqTextureSampleOptionsBase::minWidth;
+		using CqTextureSampleOptionsBase::truncAmount;
+		using CqTextureSampleOptionsBase::logTruncAmount;
+		using CqTextureSampleOptionsBase::filterType;
+		using CqTextureSampleOptionsBase::startChannel;
+		using CqTextureSampleOptionsBase::numChannels;
+		using CqTextureSampleOptionsBase::sWrapMode;
+		using CqTextureSampleOptionsBase::tWrapMode;
 
 		// Modifiers from CqTextureSampleOptionsBase
-		CqTextureSampleOptionsBase::setBlur;
-		CqTextureSampleOptionsBase::setSBlur;
-		CqTextureSampleOptionsBase::setTBlur;
-		CqTextureSampleOptionsBase::setWidth;
-		CqTextureSampleOptionsBase::setSWidth;
-		CqTextureSampleOptionsBase::setTWidth;
-		CqTextureSampleOptionsBase::setMinWidth;
-		CqTextureSampleOptionsBase::setTruncAmount;
-		CqTextureSampleOptionsBase::setFilterType;
-		CqTextureSampleOptionsBase::setStartChannel;
-		CqTextureSampleOptionsBase::setNumChannels;
-		CqTextureSampleOptionsBase::setWrapMode;
-		CqTextureSampleOptionsBase::setSWrapMode;
-		CqTextureSampleOptionsBase::setTWrapMode;
+		using CqTextureSampleOptionsBase::setBlur;
+		using CqTextureSampleOptionsBase::setSBlur;
+		using CqTextureSampleOptionsBase::setTBlur;
+		using CqTextureSampleOptionsBase::setWidth;
+		using CqTextureSampleOptionsBase::setSWidth;
+		using CqTextureSampleOptionsBase::setTWidth;
+		using CqTextureSampleOptionsBase::setMinWidth;
+		using CqTextureSampleOptionsBase::setTruncAmount;
+		using CqTextureSampleOptionsBase::setFilterType;
+		using CqTextureSampleOptionsBase::setStartChannel;
+		using CqTextureSampleOptionsBase::setNumChannels;
+		using CqTextureSampleOptionsBase::setWrapMode;
+		using CqTextureSampleOptionsBase::setSWrapMode;
+		using CqTextureSampleOptionsBase::setTWrapMode;
 
 		// Other stuff from CqTextureSampleOptionsBase
-		CqTextureSampleOptionsBase::fillFromFileHeader;
+		using CqTextureSampleOptionsBase::fillFromFileHeader;
 
 		//--------------------------------------------------
 		// Shadow-specific sample options




In file included from libs/tex/io/tiffoutputfile.cpp:38:
In file included from libs/tex/io/tiffoutputfile.h:43:
In file included from include/aqsis/tex/io/itexoutputfile.h:46:
In file included from include/aqsis/tex/buffers/mixedimagebuffer.h:44:
/usr/include/c++/v1/map:629:15: error: object of type
      'std::__1::pair<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>' cannot be assigned
      because its copy assignment operator is implicitly deleted
        {__nc = __v.__cc; return *this;}
              ^
/usr/include/c++/v1/__tree:1645:35: note: in instantiation of member function
      'std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>::operator='
      requested here
                __cache->__value_ = *__first;
                                  ^
/usr/include/c++/v1/__tree:1575:9: note: in instantiation of function template specialization
      'std::__1::__tree<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
      std::__1::__map_value_compare<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
      std::__1::less<Aqsis::CqTexFileHeader::CqTypeInfoHolder>, true>,
      std::__1::allocator<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      boost::any> >
      >::__assign_multi<std::__1::__tree_const_iterator<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      boost::any>,
      std::__1::__tree_node<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      boost::any>, void *> *, long> >' requested here
        __assign_multi(__t.begin(), __t.end());
        ^
/usr/include/c++/v1/map:912:21: note: in instantiation of member function
      'std::__1::__tree<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
      std::__1::__map_value_compare<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
      std::__1::less<Aqsis::CqTexFileHeader::CqTypeInfoHolder>, true>,
      std::__1::allocator<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      boost::any> > >::operator=' requested here
            __tree_ = __m.__tree_;
                    ^
include/aqsis/tex/io/texfileheader.h:74:7: note:
      in instantiation of member function 'std::__1::map<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
      boost::any, std::__1::less<Aqsis::CqTexFileHeader::CqTypeInfoHolder>,
      std::__1::allocator<std::__1::pair<const Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>
      > >::operator=' requested here
class CqTexFileHeader
      ^
/usr/include/c++/v1/utility:325:5: note: copy assignment operator is implicitly deleted because
      'pair<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>' has a user-declared move
      constructor
    pair(pair&&) = default;
    ^

--- include/aqsis/tex/io/texfileheader.h.orig	2012-08-24 12:26:50 UTC
+++ include/aqsis/tex/io/texfileheader.h
@@ -43,6 +43,9 @@
 
 #include <iostream>
 #include <map>
+#if __cplusplus >= 201103L
+#include <typeindex>
+#endif
 
 #include <boost/any.hpp>
 #include <boost/shared_ptr.hpp>
@@ -74,9 +77,13 @@ namespace Aqsis {
 class CqTexFileHeader
 {
 	private:
+#if __cplusplus < 201103L
 		class CqTypeInfoHolder;
 		/// Underlying map type.
 		typedef std::map<CqTypeInfoHolder, boost::any> TqAttributeMap;
+#else
+		typedef std::map<std::type_index, boost::any> TqAttributeMap;
+#endif
 		typedef TqAttributeMap::const_iterator const_iterator;
 	public:
 
@@ -180,6 +187,7 @@ class CqTexFileHeader
 };
 
 
+#if __cplusplus < 201103L
 //==============================================================================
 // Implementation details
 //==============================================================================
@@ -200,6 +208,7 @@ class CqTexFileHeader::CqTypeInfoHolder
 			return m_typeInfo.before(rhs.m_typeInfo) != 0;
 		}
 };
+#endif
 
 //------------------------------------------------------------------------------
 // CqTexFileHeader
@@ -261,13 +270,21 @@ inline void CqTexFileHeader::setTimestamp()
 template<typename AttrTagType>
 inline void CqTexFileHeader::set(const typename AttrTagType::type& value)
 {
+#if __cplusplus < 201103L
 	m_attributeMap[CqTypeInfoHolder(typeid(AttrTagType))] = value;
+#else
+	m_attributeMap[std::type_index(typeid(AttrTagType))] = value;
+#endif
 }
 
 template<typename AttrTagType>
 void CqTexFileHeader::erase()
 {
+#if __cplusplus < 201103L
 	m_attributeMap.erase(CqTypeInfoHolder(typeid(AttrTagType)));
+#else
+	m_attributeMap.erase(std::type_index(typeid(AttrTagType)));
+#endif
 }
 
 template<typename AttrTagType>
@@ -280,7 +297,11 @@ inline typename AttrTagType::type& CqTexFileHeader::fi
 template<typename AttrTagType>
 inline const typename AttrTagType::type& CqTexFileHeader::find() const
 {
+#if __cplusplus < 201103L
 	const_iterator iter = m_attributeMap.find(CqTypeInfoHolder(typeid(AttrTagType)));
+#else
+	const_iterator iter = m_attributeMap.find(std::type_index(typeid(AttrTagType)));
+#endif
 	if(iter == m_attributeMap.end())
 	{
 		AQSIS_THROW_XQERROR(XqInternal, EqE_BadFile, "Requested attribute \""
@@ -310,7 +331,11 @@ inline typename AttrTagType::type* CqTexFileHeader::fi
 template<typename AttrTagType>
 inline const typename AttrTagType::type* CqTexFileHeader::findPtr() const
 {
+#if __cplusplus < 201103L
 	const_iterator iter = m_attributeMap.find(CqTypeInfoHolder(typeid(AttrTagType)));
+#else
+	const_iterator iter = m_attributeMap.find(std::type_index(typeid(AttrTagType)));
+#endif
 	if(iter == m_attributeMap.end())
 		return 0;
 	return & boost::any_cast<const typename AttrTagType::type&>(iter->second);




libs/core/texturing_old/shadowmap_old.cpp: In member function 'void Aqsis::CqShadowMapOld::LoadZFile()':
libs/core/texturing_old/shadowmap_old.cpp:179:13: error: no match for 'operator!=' (operand types are 'std::ifstream {aka std::basic_ifstream<char>}' and 'long int')
   if ( file != NULL )
             ^

--- libs/core/texturing_old/shadowmap_old.cpp.orig	2012-08-24 12:26:50 UTC
+++ libs/core/texturing_old/shadowmap_old.cpp
@@ -176,7 +176,7 @@ void CqShadowMapOld::LoadZFile()
 	{
 		std::ifstream file( m_strName.c_str(), std::ios::in | std::ios::binary );
 
-		if ( file != NULL )
+		if ( file )
 		{
 			// Save a file type and version marker
 			TqPchar origHeader = tokenCast(ZFILE_HEADER);




libs/shadervm/dsoshadeops.cpp:150:44: error: cast from pointer to smaller type 'char' loses information
                            while( ( pShadeOp->m_opspec )[0] != (char) NULL )
                                                                ^~~~~~~~~~~

--- libs/shadervm/dsoshadeops.cpp.orig	2012-08-24 12:26:50 UTC
+++ libs/shadervm/dsoshadeops.cpp
@@ -147,7 +147,7 @@ CqDSORepository::getShadeOpMethods(CqString* pShadeOpN
 		    {
 			    //We have an appropriate named shadeop table
 			    SqShadeOp *pShadeOp = (SqShadeOp*) pTableSymbol;
-			    while( ( pShadeOp->m_opspec )[0] != (char) NULL )
+			    while( ( pShadeOp->m_opspec )[0] != '\0' )
 			    {
 				    SqDSOExternalCall *pDSOCall = NULL;
 				    pDSOCall = parseShadeOpTableEntry( handle, pShadeOp );




libs/shadervm/shaderexecenv/shadeops_tmap.cpp:257:56: error: ISO C++11 does not allow access declarations; use using declarations instead
                CqSampleOptionExtractorBase<CqTextureSampleOptions>::extractVarying;
                                                                     ^
                using

--- libs/shadervm/shaderexecenv/shadeops_tmap.cpp.orig	2012-08-24 12:26:50 UTC
+++ libs/shadervm/shaderexecenv/shadeops_tmap.cpp
@@ -254,7 +254,7 @@ class CqSampleOptionExtractor
 			extractUniformAndCacheVarying(paramList, numParams, opts);
 		}
 
-		CqSampleOptionExtractorBase<CqTextureSampleOptions>::extractVarying;
+		using CqSampleOptionExtractorBase<CqTextureSampleOptions>::extractVarying;
 };
 
 




tools/displays/piqsl/piqsldisplay.cpp:400:35: error: non-constant-expression cannot be narrowed from type 'TqInt' (aka 'int') to 'unsigned int' in initializer list [-Wc++11-narrowing]
                                        PtDspyDevFormat fmt = {name, typeID};
                                                                     ^~~~~~
tools/displays/piqsl/piqsldisplay.cpp:400:35: note: insert an explicit cast to silence this issue
                                        PtDspyDevFormat fmt = {name, typeID};
                                                                     ^~~~~~
                                                                     static_cast<unsigned int>( )

--- tools/displays/piqsl/piqsldisplay.cpp.orig	2012-08-24 12:26:50 UTC
+++ tools/displays/piqsl/piqsldisplay.cpp
@@ -397,7 +397,7 @@ extern "C" PtDspyError DspyImageOpen(PtDspyImageHandle
 					TqInt typeID = g_mapNameToType[typeName];
 					char* name = new char[strlen(formatName)+1];
 					strcpy(name, formatName);
-					PtDspyDevFormat fmt = {name, typeID};
+					PtDspyDevFormat fmt = {name, static_cast<unsigned>(typeID)};
 					outFormat.push_back(fmt);
 					formatNode = formatNode->NextSiblingElement("Format");
 					iformat++;
@@ -450,8 +450,8 @@ extern "C" PtDspyError DspyImageData(PtDspyImageHandle
 
 	TiXmlElement* bucketDataXML = new TiXmlElement("BucketData");
 	std::stringstream base64Data;

Return to bug 220787

Added Link Here

(-)b/graphics/aqsis/files/patch-include_aqsis_tex_filtering_texturesampleoptions.h (+149 lines)
1	In file included from libs/tex/filtering/dummytexturesampler.cpp:38:
2	In file included from libs/tex/filtering/dummytexturesampler.h:41:
3	In file included from include/aqsis/tex/filtering/itexturesampler.h:46:
4	include/aqsis/tex/filtering/texturesampleoptions.h:239:31: error: ISO C++11 does not allow access declarations; use using declarations instead
5	CqTextureSampleOptionsBase::sBlur;
6	^
7	using
8	include/aqsis/tex/filtering/texturesampleoptions.h:240:31: error: ISO C++11 does not allow access declarations; use using declarations instead
9	CqTextureSampleOptionsBase::tBlur;
10	^
11	using
12	include/aqsis/tex/filtering/texturesampleoptions.h:241:31: error: ISO C++11 does not allow access declarations; use using declarations instead
13	CqTextureSampleOptionsBase::sWidth;
14	^
15	using
16	[...]
17
18	--- include/aqsis/tex/filtering/texturesampleoptions.h.orig 2012-08-24 12:26:50 UTC
19	+++ include/aqsis/tex/filtering/texturesampleoptions.h
20	@@ -236,37 +236,37 @@ class CqTextureSampleOptions : private CqTextureSample
21	CqTextureSampleOptions();
22
23	// Accessors from CqTextureSampleOptionsBase
24	- CqTextureSampleOptionsBase::sBlur;
25	- CqTextureSampleOptionsBase::tBlur;
26	- CqTextureSampleOptionsBase::sWidth;
27	- CqTextureSampleOptionsBase::tWidth;
28	- CqTextureSampleOptionsBase::minWidth;
29	- CqTextureSampleOptionsBase::truncAmount;
30	- CqTextureSampleOptionsBase::logTruncAmount;
31	- CqTextureSampleOptionsBase::filterType;
32	- CqTextureSampleOptionsBase::startChannel;
33	- CqTextureSampleOptionsBase::numChannels;
34	- CqTextureSampleOptionsBase::sWrapMode;
35	- CqTextureSampleOptionsBase::tWrapMode;
36	+ using CqTextureSampleOptionsBase::sBlur;
37	+ using CqTextureSampleOptionsBase::tBlur;
38	+ using CqTextureSampleOptionsBase::sWidth;
39	+ using CqTextureSampleOptionsBase::tWidth;
40	+ using CqTextureSampleOptionsBase::minWidth;
41	+ using CqTextureSampleOptionsBase::truncAmount;
42	+ using CqTextureSampleOptionsBase::logTruncAmount;
43	+ using CqTextureSampleOptionsBase::filterType;
44	+ using CqTextureSampleOptionsBase::startChannel;
45	+ using CqTextureSampleOptionsBase::numChannels;
46	+ using CqTextureSampleOptionsBase::sWrapMode;
47	+ using CqTextureSampleOptionsBase::tWrapMode;
48
49	// Modifiers from CqTextureSampleOptionsBase
50	- CqTextureSampleOptionsBase::setBlur;
51	- CqTextureSampleOptionsBase::setSBlur;
52	- CqTextureSampleOptionsBase::setTBlur;
53	- CqTextureSampleOptionsBase::setWidth;
54	- CqTextureSampleOptionsBase::setSWidth;
55	- CqTextureSampleOptionsBase::setTWidth;
56	- CqTextureSampleOptionsBase::setMinWidth;
57	- CqTextureSampleOptionsBase::setTruncAmount;
58	- CqTextureSampleOptionsBase::setFilterType;
59	- CqTextureSampleOptionsBase::setStartChannel;
60	- CqTextureSampleOptionsBase::setNumChannels;
61	- CqTextureSampleOptionsBase::setWrapMode;
62	- CqTextureSampleOptionsBase::setSWrapMode;
63	- CqTextureSampleOptionsBase::setTWrapMode;
64	+ using CqTextureSampleOptionsBase::setBlur;
65	+ using CqTextureSampleOptionsBase::setSBlur;
66	+ using CqTextureSampleOptionsBase::setTBlur;
67	+ using CqTextureSampleOptionsBase::setWidth;
68	+ using CqTextureSampleOptionsBase::setSWidth;
69	+ using CqTextureSampleOptionsBase::setTWidth;
70	+ using CqTextureSampleOptionsBase::setMinWidth;
71	+ using CqTextureSampleOptionsBase::setTruncAmount;
72	+ using CqTextureSampleOptionsBase::setFilterType;
73	+ using CqTextureSampleOptionsBase::setStartChannel;
74	+ using CqTextureSampleOptionsBase::setNumChannels;
75	+ using CqTextureSampleOptionsBase::setWrapMode;
76	+ using CqTextureSampleOptionsBase::setSWrapMode;
77	+ using CqTextureSampleOptionsBase::setTWrapMode;
78
79	// Other stuff from CqTextureSampleOptionsBase
80	- CqTextureSampleOptionsBase::fillFromFileHeader;
81	+ using CqTextureSampleOptionsBase::fillFromFileHeader;
82
83	//--------------------------------------------------
84	// Plain-texture specific sample options
85	@@ -307,37 +307,37 @@ class CqShadowSampleOptions : private CqTextureSampleO
86	CqShadowSampleOptions();
87
88	// Accessors from CqTextureSampleOptionsBase
89	- CqTextureSampleOptionsBase::sBlur;
90	- CqTextureSampleOptionsBase::tBlur;
91	- CqTextureSampleOptionsBase::sWidth;
92	- CqTextureSampleOptionsBase::tWidth;
93	- CqTextureSampleOptionsBase::minWidth;
94	- CqTextureSampleOptionsBase::truncAmount;
95	- CqTextureSampleOptionsBase::logTruncAmount;
96	- CqTextureSampleOptionsBase::filterType;
97	- CqTextureSampleOptionsBase::startChannel;
98	- CqTextureSampleOptionsBase::numChannels;
99	- CqTextureSampleOptionsBase::sWrapMode;
100	- CqTextureSampleOptionsBase::tWrapMode;
101	+ using CqTextureSampleOptionsBase::sBlur;
102	+ using CqTextureSampleOptionsBase::tBlur;
103	+ using CqTextureSampleOptionsBase::sWidth;
104	+ using CqTextureSampleOptionsBase::tWidth;
105	+ using CqTextureSampleOptionsBase::minWidth;
106	+ using CqTextureSampleOptionsBase::truncAmount;
107	+ using CqTextureSampleOptionsBase::logTruncAmount;
108	+ using CqTextureSampleOptionsBase::filterType;
109	+ using CqTextureSampleOptionsBase::startChannel;
110	+ using CqTextureSampleOptionsBase::numChannels;
111	+ using CqTextureSampleOptionsBase::sWrapMode;
112	+ using CqTextureSampleOptionsBase::tWrapMode;
113
114	// Modifiers from CqTextureSampleOptionsBase
115	- CqTextureSampleOptionsBase::setBlur;
116	- CqTextureSampleOptionsBase::setSBlur;
117	- CqTextureSampleOptionsBase::setTBlur;
118	- CqTextureSampleOptionsBase::setWidth;
119	- CqTextureSampleOptionsBase::setSWidth;
120	- CqTextureSampleOptionsBase::setTWidth;
121	- CqTextureSampleOptionsBase::setMinWidth;
122	- CqTextureSampleOptionsBase::setTruncAmount;
123	- CqTextureSampleOptionsBase::setFilterType;
124	- CqTextureSampleOptionsBase::setStartChannel;
125	- CqTextureSampleOptionsBase::setNumChannels;
126	- CqTextureSampleOptionsBase::setWrapMode;
127	- CqTextureSampleOptionsBase::setSWrapMode;
128	- CqTextureSampleOptionsBase::setTWrapMode;
129	+ using CqTextureSampleOptionsBase::setBlur;
130	+ using CqTextureSampleOptionsBase::setSBlur;
131	+ using CqTextureSampleOptionsBase::setTBlur;
132	+ using CqTextureSampleOptionsBase::setWidth;
133	+ using CqTextureSampleOptionsBase::setSWidth;
134	+ using CqTextureSampleOptionsBase::setTWidth;
135	+ using CqTextureSampleOptionsBase::setMinWidth;
136	+ using CqTextureSampleOptionsBase::setTruncAmount;
137	+ using CqTextureSampleOptionsBase::setFilterType;
138	+ using CqTextureSampleOptionsBase::setStartChannel;
139	+ using CqTextureSampleOptionsBase::setNumChannels;
140	+ using CqTextureSampleOptionsBase::setWrapMode;
141	+ using CqTextureSampleOptionsBase::setSWrapMode;
142	+ using CqTextureSampleOptionsBase::setTWrapMode;
143
144	// Other stuff from CqTextureSampleOptionsBase
145	- CqTextureSampleOptionsBase::fillFromFileHeader;
146	+ using CqTextureSampleOptionsBase::fillFromFileHeader;
147
148	//--------------------------------------------------
149	// Shadow-specific sample options

Added Link Here

(-)b/graphics/aqsis/files/patch-include_aqsis_tex_io_texfileheader.h (+137 lines)
1	In file included from libs/tex/io/tiffoutputfile.cpp:38:
2	In file included from libs/tex/io/tiffoutputfile.h:43:
3	In file included from include/aqsis/tex/io/itexoutputfile.h:46:
4	In file included from include/aqsis/tex/buffers/mixedimagebuffer.h:44:
5	/usr/include/c++/v1/map:629:15: error: object of type
6	'std::__1::pair<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>' cannot be assigned
7	because its copy assignment operator is implicitly deleted
8	{__nc = __v.__cc; return *this;}
9	^
10	/usr/include/c++/v1/__tree:1645:35: note: in instantiation of member function
11	'std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>::operator='
12	requested here
13	__cache->__value_ = *__first;
14	^
15	/usr/include/c++/v1/__tree:1575:9: note: in instantiation of function template specialization
16	'std::__1::__tree<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
17	std::__1::__map_value_compare<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
18	std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
19	std::__1::less<Aqsis::CqTexFileHeader::CqTypeInfoHolder>, true>,
20	std::__1::allocator<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
21	boost::any> >
22	>::__assign_multi<std::__1::__tree_const_iterator<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
23	boost::any>,
24	std::__1::__tree_node<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
25	boost::any>, void > , long> >' requested here
26	__assign_multi(__t.begin(), __t.end());
27	^
28	/usr/include/c++/v1/map:912:21: note: in instantiation of member function
29	'std::__1::__tree<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
30	std::__1::__map_value_compare<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
31	std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>,
32	std::__1::less<Aqsis::CqTexFileHeader::CqTypeInfoHolder>, true>,
33	std::__1::allocator<std::__1::__value_type<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
34	boost::any> > >::operator=' requested here
35	__tree_ = __m.__tree_;
36	^
37	include/aqsis/tex/io/texfileheader.h:74:7: note:
38	in instantiation of member function 'std::__1::map<Aqsis::CqTexFileHeader::CqTypeInfoHolder,
39	boost::any, std::__1::less<Aqsis::CqTexFileHeader::CqTypeInfoHolder>,
40	std::__1::allocator<std::__1::pair<const Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>
41	> >::operator=' requested here
42	class CqTexFileHeader
43	^
44	/usr/include/c++/v1/utility:325:5: note: copy assignment operator is implicitly deleted because
45	'pair<Aqsis::CqTexFileHeader::CqTypeInfoHolder, boost::any>' has a user-declared move
46	constructor
47	pair(pair&&) = default;
48	^
49
50	--- include/aqsis/tex/io/texfileheader.h.orig 2012-08-24 12:26:50 UTC
51	+++ include/aqsis/tex/io/texfileheader.h
52	@@ -43,6 +43,9 @@
53
54	#include <iostream>
55	#include <map>
56	+#if __cplusplus >= 201103L
57	+#include <typeindex>
58	+#endif
59
60	#include <boost/any.hpp>
61	#include <boost/shared_ptr.hpp>
62	@@ -74,9 +77,13 @@ namespace Aqsis {
63	class CqTexFileHeader
64	{
65	private:
66	+#if __cplusplus < 201103L
67	class CqTypeInfoHolder;
68	/// Underlying map type.
69	typedef std::map<CqTypeInfoHolder, boost::any> TqAttributeMap;
70	+#else
71	+ typedef std::map<std::type_index, boost::any> TqAttributeMap;
72	+#endif
73	typedef TqAttributeMap::const_iterator const_iterator;
74	public:
75
76	@@ -180,6 +187,7 @@ class CqTexFileHeader
77	};
78
79
80	+#if __cplusplus < 201103L
81	//==============================================================================
82	// Implementation details
83	//==============================================================================
84	@@ -200,6 +208,7 @@ class CqTexFileHeader::CqTypeInfoHolder
85	return m_typeInfo.before(rhs.m_typeInfo) != 0;
86	}
87	};
88	+#endif
89
90	//------------------------------------------------------------------------------
91	// CqTexFileHeader
92	@@ -261,13 +270,21 @@ inline void CqTexFileHeader::setTimestamp()
93	template<typename AttrTagType>
94	inline void CqTexFileHeader::set(const typename AttrTagType::type& value)
95	{
96	+#if __cplusplus < 201103L
97	m_attributeMap[CqTypeInfoHolder(typeid(AttrTagType))] = value;
98	+#else
99	+ m_attributeMap[std::type_index(typeid(AttrTagType))] = value;
100	+#endif
101	}
102
103	template<typename AttrTagType>
104	void CqTexFileHeader::erase()
105	{
106	+#if __cplusplus < 201103L
107	m_attributeMap.erase(CqTypeInfoHolder(typeid(AttrTagType)));
108	+#else
109	+ m_attributeMap.erase(std::type_index(typeid(AttrTagType)));
110	+#endif
111	}
112
113	template<typename AttrTagType>
114	@@ -280,7 +297,11 @@ inline typename AttrTagType::type& CqTexFileHeader::fi
115	template<typename AttrTagType>
116	inline const typename AttrTagType::type& CqTexFileHeader::find() const
117	{
118	+#if __cplusplus < 201103L
119	const_iterator iter = m_attributeMap.find(CqTypeInfoHolder(typeid(AttrTagType)));
120	+#else
121	+ const_iterator iter = m_attributeMap.find(std::type_index(typeid(AttrTagType)));
122	+#endif
123	if(iter == m_attributeMap.end())
124	{
125	AQSIS_THROW_XQERROR(XqInternal, EqE_BadFile, "Requested attribute \""
126	@@ -310,7 +331,11 @@ inline typename AttrTagType::type* CqTexFileHeader::fi
127	template<typename AttrTagType>
128	inline const typename AttrTagType::type* CqTexFileHeader::findPtr() const
129	{
130	+#if __cplusplus < 201103L
131	const_iterator iter = m_attributeMap.find(CqTypeInfoHolder(typeid(AttrTagType)));
132	+#else
133	+ const_iterator iter = m_attributeMap.find(std::type_index(typeid(AttrTagType)));
134	+#endif
135	if(iter == m_attributeMap.end())
136	return 0;
137	return & boost::any_cast<const typename AttrTagType::type&>(iter->second);

Added Link Here

(-)b/graphics/aqsis/files/patch-libs_core_texturing__old_shadowmap__old.cpp (+16 lines)
1	libs/core/texturing_old/shadowmap_old.cpp: In member function 'void Aqsis::CqShadowMapOld::LoadZFile()':
2	libs/core/texturing_old/shadowmap_old.cpp:179:13: error: no match for 'operator!=' (operand types are 'std::ifstream {aka std::basic_ifstream<char>}' and 'long int')
3	if ( file != NULL )
4	^
5
6	--- libs/core/texturing_old/shadowmap_old.cpp.orig 2012-08-24 12:26:50 UTC
7	+++ libs/core/texturing_old/shadowmap_old.cpp
8	@@ -176,7 +176,7 @@ void CqShadowMapOld::LoadZFile()
9	{
10	std::ifstream file( m_strName.c_str(), std::ios::in \| std::ios::binary );
11
12	- if ( file != NULL )
13	+ if ( file )
14	{
15	// Save a file type and version marker
16	TqPchar origHeader = tokenCast(ZFILE_HEADER);

Added Link Here

(-)b/graphics/aqsis/files/patch-libs_shadervm_dsoshadeops.cpp (+15 lines)
1	libs/shadervm/dsoshadeops.cpp:150:44: error: cast from pointer to smaller type 'char' loses information
2	while( ( pShadeOp->m_opspec )[0] != (char) NULL )
3	^~~~~~~~~~~
4
5	--- libs/shadervm/dsoshadeops.cpp.orig 2012-08-24 12:26:50 UTC
6	+++ libs/shadervm/dsoshadeops.cpp
7	@@ -147,7 +147,7 @@ CqDSORepository::getShadeOpMethods(CqString* pShadeOpN
8	{
9	//We have an appropriate named shadeop table
10	SqShadeOp pShadeOp = (SqShadeOp) pTableSymbol;
11	- while( ( pShadeOp->m_opspec )[0] != (char) NULL )
12	+ while( ( pShadeOp->m_opspec )[0] != '\0' )
13	{
14	SqDSOExternalCall *pDSOCall = NULL;
15	pDSOCall = parseShadeOpTableEntry( handle, pShadeOp );

Added Link Here

(-)b/graphics/aqsis/files/patch-libs_shadervm_shaderexecenv_shadeops__tmap.cpp (+16 lines)
1	libs/shadervm/shaderexecenv/shadeops_tmap.cpp:257:56: error: ISO C++11 does not allow access declarations; use using declarations instead
2	CqSampleOptionExtractorBase<CqTextureSampleOptions>::extractVarying;
3	^
4	using
5
6	--- libs/shadervm/shaderexecenv/shadeops_tmap.cpp.orig 2012-08-24 12:26:50 UTC
7	+++ libs/shadervm/shaderexecenv/shadeops_tmap.cpp
8	@@ -254,7 +254,7 @@ class CqSampleOptionExtractor
9	extractUniformAndCacheVarying(paramList, numParams, opts);
10	}
11
12	- CqSampleOptionExtractorBase<CqTextureSampleOptions>::extractVarying;
13	+ using CqSampleOptionExtractorBase<CqTextureSampleOptions>::extractVarying;
14	};
15
16

Lines 1-6 Link Here

(-)b/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp (-1 / +18 lines)
		1	tools/displays/piqsl/piqsldisplay.cpp:400:35: error: non-constant-expression cannot be narrowed from type 'TqInt' (aka 'int') to 'unsigned int' in initializer list [-Wc++11-narrowing]
		2	PtDspyDevFormat fmt = {name, typeID};
		3	^~~~~~
		4	tools/displays/piqsl/piqsldisplay.cpp:400:35: note: insert an explicit cast to silence this issue
		5	PtDspyDevFormat fmt = {name, typeID};
		6	^~~~~~
		7	static_cast<unsigned int>( )
		8
1	--- tools/displays/piqsl/piqsldisplay.cpp.orig 2012-08-24 12:26:50 UTC	9	--- tools/displays/piqsl/piqsldisplay.cpp.orig 2012-08-24 12:26:50 UTC
2	+++ tools/displays/piqsl/piqsldisplay.cpp	10	+++ tools/displays/piqsl/piqsldisplay.cpp
3	@@ -450,8 +450,8 @@ extern "C" PtDspyError DspyImageData(PtD	11	@@ -397,7 +397,7 @@ extern "C" PtDspyError DspyImageOpen(PtDspyImageHandle
		12	TqInt typeID = g_mapNameToType[typeName];
		13	char* name = new char[strlen(formatName)+1];
		14	strcpy(name, formatName);
		15	- PtDspyDevFormat fmt = {name, typeID};
		16	+ PtDspyDevFormat fmt = {name, static_cast<unsigned>(typeID)};
		17	outFormat.push_back(fmt);
		18	formatNode = formatNode->NextSiblingElement("Format");
		19	iformat++;
		20	@@ -450,8 +450,8 @@ extern "C" PtDspyError DspyImageData(PtDspyImageHandle
4		21
5	TiXmlElement* bucketDataXML = new TiXmlElement("BucketData");	22	TiXmlElement* bucketDataXML = new TiXmlElement("BucketData");
6	std::stringstream base64Data;	23	std::stringstream base64Data;