Changeset View
Changeset View
Standalone View
Standalone View
intern/cycles/util/util_function.h
| Show All 11 Lines | |||||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
| * See the License for the specific language governing permissions and | * See the License for the specific language governing permissions and | ||||
| * limitations under the License. | * limitations under the License. | ||||
| */ | */ | ||||
| #ifndef __UTIL_FUNCTION_H__ | #ifndef __UTIL_FUNCTION_H__ | ||||
| #define __UTIL_FUNCTION_H__ | #define __UTIL_FUNCTION_H__ | ||||
| #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) | |||||
| # include <functional> | |||||
| #else | |||||
| #include <boost/bind.hpp> | # include <boost/bind.hpp> | ||||
| #include <boost/function.hpp> | # include <boost/function.hpp> | ||||
| #endif | |||||
| CCL_NAMESPACE_BEGIN | CCL_NAMESPACE_BEGIN | ||||
| #if (__cplusplus > 199711L) || (defined(_MSC_VER) && _MSC_VER >= 1800) | |||||
| # define function_bind std::bind | |||||
| using std::function; | |||||
sergey: Would prefer eiter `using std::placeholders` or even better `using std::placeholders::_[0-9]`… | |||||
| using std::placeholders::_1; | |||||
| using std::placeholders::_2; | |||||
| using std::placeholders::_3; | |||||
| using std::placeholders::_4; | |||||
| using std::placeholders::_5; | |||||
| using std::placeholders::_6; | |||||
| using std::placeholders::_7; | |||||
| using std::placeholders::_8; | |||||
| using std::placeholders::_9; | |||||
| #else | |||||
| using boost::function; | using boost::function; | ||||
| #define function_bind boost::bind | # define function_bind boost::bind | ||||
| #endif | |||||
| CCL_NAMESPACE_END | CCL_NAMESPACE_END | ||||
| #endif /* __UTIL_FUNCTION_H__ */ | #endif /* __UTIL_FUNCTION_H__ */ | ||||
Would prefer eiter using std::placeholders or even better using std::placeholders::_[0-9] and zap p_n from the patch all together.