diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 17:56:04 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-11 17:56:04 +0300 |
commit | 4d115f21595d255f2d335d2f307ee822b381ea54 (patch) | |
tree | dbbd84b1539f4b87df608cb3e7c84cfde5fcb3f6 /intern/cycles/util | |
parent | 54e1d3815762ef964a74f179ef846110673e743f (diff) | |
parent | 66d8bfb85c61aafe3bad2edf0e7b4d9d694ee2e7 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/util')
-rw-r--r-- | intern/cycles/util/util_unique_ptr.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/intern/cycles/util/util_unique_ptr.h b/intern/cycles/util/util_unique_ptr.h new file mode 100644 index 00000000000..1ceae73172e --- /dev/null +++ b/intern/cycles/util/util_unique_ptr.h @@ -0,0 +1,28 @@ +/* + * Copyright 2011-2013 Blender Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __UTIL_UNIQUE_PTR_H__ +#define __UTIL_UNIQUE_PTR_H__ + +#include <memory> + +CCL_NAMESPACE_BEGIN + +using std::unique_ptr; + +CCL_NAMESPACE_END + +#endif /* __UTIL_UNIQUE_PTR_H__ */ |