use lambda

kedaitinh12 · May 5, 2017 · 8babb9e · 8babb9e
1 parent 8ce8120
commit 8babb9e
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 38 deletions.
diff --git a/AudioCodecX.h b/AudioCodecX.h
@@ -25,13 +25,14 @@ class AudioCodecX {
     }
     void attach(AudioCodec codec, bool takeOwn)
     {
-        typedef OSStatus (*disposer_t)(AudioCodec);
-        struct F {
-            static OSStatus dispose(AudioCodec) { return 0; }
+        auto dispose = [](AudioCodec x) {
+            auto y = reinterpret_cast<AudioComponentInstance>(x);
+            AudioComponentInstanceDispose(y);
         };
-        disposer_t acdispose =
-            reinterpret_cast<disposer_t>(AudioComponentInstanceDispose);
-        m_codec.reset(codec, takeOwn ? acdispose : F::dispose);
+        if (takeOwn)
+            m_codec.reset(codec, dispose);
+        else
+            m_codec.reset(codec, [](AudioCodec) {});
     }
     operator AudioCodec() { return m_codec.get(); }
 

diff --git a/AudioConverterX.cpp b/AudioConverterX.cpp
@@ -13,10 +13,10 @@ AudioConverterX::AudioConverterX(const AudioStreamBasicDescription &iasbd,
 }
 void AudioConverterX::attach(AudioConverterRef converter, bool takeOwn)
 {
-    struct F {
-        static OSStatus dispose(AudioConverterRef) { return 0; }
-    };
-    m_converter.reset(converter, takeOwn ? AudioConverterDispose : F::dispose);
+    if (takeOwn)
+        m_converter.reset(converter, AudioConverterDispose);
+    else
+        m_converter.reset(converter, [](AudioConverterRef){});
 }
 
 UInt32 AudioConverterX::getSampleRateConverterComplexity()

diff --git a/AudioFileX.h b/AudioFileX.h
@@ -133,10 +133,10 @@ class AudioFileX {
     }
     void attach(AudioFileID file, bool takeOwn)
     {
-        struct F {
-            static OSStatus dispose(AudioFileID af) { return 0; }
-        };
-        m_file.reset(file, takeOwn ? AudioFileClose : F::dispose);
+        if (takeOwn)
+            m_file.reset(file, AudioFileClose);
+        else
+            m_file.reset(file, [](AudioFileID){});
     }
     operator AudioFileID() { return m_file.get(); }
     void close() { m_file.reset(); }

diff --git a/ExtAudioFileX.h b/ExtAudioFileX.h
@@ -15,10 +15,10 @@ class ExtAudioFileX {
     }
     void attach(ExtAudioFileRef file, bool takeOwn)
     {
-        struct F {
-            static OSStatus dispose(ExtAudioFileRef) { return 0; }
-        };
-        m_file.reset(file, takeOwn ? ExtAudioFileDispose : F::dispose);
+        if (takeOwn)
+            m_file.reset(file, ExtAudioFileDispose);
+        else
+            m_file.reset(file, [](ExtAudioFileRef){});
     }
     operator ExtAudioFileRef() { return m_file.get(); }
 

diff --git a/dl.h b/dl.h
@@ -20,11 +20,10 @@ class DL {
     DL() {}
     DL(HMODULE handle, bool own=true)
     {
-        struct noop { static void call(HMODULE x) {} };
         if (own)
             m_module.reset(handle, FreeLibrary);
         else
-            m_module.reset(handle, noop::call);
+            m_module.reset(handle, [](HMODULE){});
     }
     bool load(const std::wstring &path)
     {

diff --git a/logging.h b/logging.h
@@ -17,9 +17,8 @@ class Log {
     bool is_enabled() { return m_streams.size() != 0; }
     void enable_stderr()
     {
-        struct Lambda { static void call(FILE*) {} };
         if (m_stderr_type != FILE_TYPE_UNKNOWN)
-            m_streams.push_back(std::shared_ptr<FILE>(stderr, Lambda::call));
+            m_streams.push_back(std::shared_ptr<FILE>(stderr, [](FILE*){}));
     }
     void enable_file(const wchar_t *filename)
     {

diff --git a/main.cpp b/main.cpp
@@ -1599,13 +1599,10 @@ int wmain1(int argc, wchar_t **argv)
         const wchar_t *ifilename = 0;
 
         if (opts.sort_args) {
-            struct Sorter {
-                static bool cmp(const wchar_t *a, const wchar_t *b)
-                {
-                    return std::wcscmp(a, b) < 0;
-                }
-            };
-            std::sort(&argv[0], &argv[argc], Sorter::cmp);
+            std::sort(&argv[0], &argv[argc],
+                      [](const wchar_t *a, const wchar_t *b) {
+                          return std::wcscmp(a, b) < 0;
+                      });
         }
         for (int i = 0; i < argc; ++i) {
             ifilename = argv[i];

diff --git a/textfile.cpp b/textfile.cpp
@@ -18,16 +18,13 @@ void throwIfError(HRESULT expr, const char *msg)
 
 std::wstring load_text_file(const std::wstring &path, uint32_t codepage)
 {
-    struct F {
-        static void release(IUnknown *x) {  x->Release(); }
-    };
-
     IStream *stream;
     HRESULT hr = SHCreateStreamOnFileW(path.c_str(),
                                        STGM_READ | STGM_SHARE_DENY_WRITE,
                                        &stream);
     if (FAILED(hr)) win32::throw_error(path, hr);
-    std::shared_ptr<IStream> streamPtr(stream, F::release);
+    auto release_func = [](IUnknown *x) { x->Release(); };
+    std::shared_ptr<IStream> streamPtr(stream, release_func);
 
     LARGE_INTEGER li = {{ 0 }};
     ULARGE_INTEGER ui;
@@ -43,7 +40,7 @@ std::wstring load_text_file(const std::wstring &path, uint32_t codepage)
     IMultiLanguage2 *mlang;
     HR(CoCreateInstance(CLSID_CMultiLanguage, 0, CLSCTX_INPROC_SERVER,
                 IID_IMultiLanguage2, (void**)(&mlang)));
-    std::shared_ptr<IMultiLanguage2> mlangPtr(mlang, F::release);
+    std::shared_ptr<IMultiLanguage2> mlangPtr(mlang, release_func);
 
     if (!codepage) {
         DetectEncodingInfo encoding[5];

diff --git a/win32util.h b/win32util.h
@@ -113,14 +113,14 @@ namespace win32 {
     inline std::shared_ptr<FILE> fopen(const std::wstring &path,
                                        const wchar_t *mode)
     {
-        struct noop { static void call(FILE*) {} };
+        auto noop_close = [](FILE *){};
         if (path != L"-")
             return std::shared_ptr<FILE>(wfopenx(path.c_str(), mode),
                                          std::fclose);
         else if (std::wcschr(mode, L'r'))
-            return std::shared_ptr<FILE>(stdin, noop::call);
+            return std::shared_ptr<FILE>(stdin, noop_close);
         else
-            return std::shared_ptr<FILE>(stdout, noop::call);
+            return std::shared_ptr<FILE>(stdout, noop_close);
     }
 
     inline bool is_seekable(int fd)