Ignore:
Timestamp:
Jul 13, 2018 6:30:16 AM (23 months ago)
Author:
meeh <meeh@…>
Branches:
master
Children:
818e70d
Parents:
21b3864
Message:

Fixed a load of issues related to my "sync" approach, and Mac OSX's "async" API.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • launchers/macosx/obj-cpp/JavaHelper.h

    r21b3864 r6d0f80f  
    88#include <sstream>
    99#include <list>
    10 #include <experimental/optional>
    1110#include <stdlib.h>
    1211
     
    1918#include <CoreFoundation/CFString.h>
    2019
     20#include "optional.hpp"
    2121#include "strutil.hpp"
    2222#include "subprocess.hpp"
     23#include "neither/maybe.hpp"
     24#include "RouterTask.h"
    2325
    2426using namespace subprocess;
     27using namespace neither;
     28
     29using maybeAnRouterRunner = std::experimental::optional<RouterTask*>;
     30
     31extern std::mutex globalRouterStatusMutex;
     32extern maybeAnRouterRunner globalRouterStatus;
    2533
    2634
     
    134142        currentJvm->JVMPlatformVersion = trim_copy(d);
    135143      }
    136      
     144
    137145    }
    138146  };
     
    151159  auto javaHomeRes = check_output({"/usr/libexec/java_home","-v",DEF_MIN_JVM_VER,"-X"});
    152160  CFDataRef javaHomes = CFDataCreate(NULL, (const UInt8 *)javaHomeRes.buf.data(), strlen(javaHomeRes.buf.data()));
    153  
     161
    154162  //CFErrorRef err;
    155163  CFPropertyListRef propertyList = CFPropertyListCreateWithData(kCFAllocatorDefault, javaHomes, kCFPropertyListImmutable, NULL, NULL);
Note: See TracChangeset for help on using the changeset viewer.