Changeset 20489

Show
Ignore:
Timestamp:
07/08/07 12:41:46 (1 year ago)
Author:
patrick
Message:

Fixed indentation errors. No functional changes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/modules/vrjuggler/vrj/Performance/PerformanceMediator.cpp

    r19729 r20489  
    157157      const std::string bit_suffix(""); 
    158158#endif 
    159        
    160    const std::string vrjuggler_subdir_base("vrjuggler"); 
    161  
    162    // If versioning is enabled, then the name of the directory containing the 
    163    // vrjuggler plug-ins must contain version information. 
     159 
     160      const std::string vrjuggler_subdir_base("vrjuggler"); 
     161 
     162      // If versioning is enabled, then the name of the directory containing 
     163      // the VR Juggler plug-ins must contain version information. 
    164164#if defined(VRJ_USE_VERSIONING) 
    165    std::string vrjuggler_ver_str; 
    166    const std::string vrjuggler_version("VRJ_VERSION"); 
    167  
    168    // If $SNX_VERSION is set, use the value of that environment variable 
    169    // as the version component of the plug-in subdirectory name. Otherwise, 
    170    // use the compile-time value provided by SNX_VERSION_DOT. 
    171    if ( ! vpr::System::getenv(vrjuggler_version, vrjuggler_ver_str) ) 
    172    { 
    173       vrjuggler_ver_str = VRJ_VERSION_DOT; 
    174    } 
    175  
    176    std::string vrjuggler_subdir(vrjuggler_subdir_base + std::string("-") + 
    177                              vrjuggler_ver_str); 
    178  
    179    // If versioning is not enabled, then the directory containing the 
    180    // vrjuggler plug-ins will not incorporate version information. 
     165      std::string vrjuggler_ver_str; 
     166      const std::string vrjuggler_version("VRJ_VERSION"); 
     167 
     168      // If $VRJ_VERSION is set, use the value of that environment variable 
     169      // as the version component of the plug-in subdirectory name. Otherwise, 
     170      // use the compile-time value provided by VRJ_VERSION_DOT. 
     171      if ( ! vpr::System::getenv(vrjuggler_version, vrjuggler_ver_str) ) 
     172      { 
     173         vrjuggler_ver_str = VRJ_VERSION_DOT; 
     174      } 
     175 
     176      std::string vrjuggler_subdir(vrjuggler_subdir_base + std::string("-") + 
     177                                   vrjuggler_ver_str); 
     178 
     179      // If versioning is not enabled, then the directory containing the 
     180      // VR Juggler plug-ins will not incorporate version information. 
    181181#else 
    182    std::string vrjuggler_subdir(vrjuggler_subdir_base); 
     182      std::string vrjuggler_subdir(vrjuggler_subdir_base); 
    183183#endif 
    184  
    185184 
    186185      std::vector<fs::path> search_path(1); 
    187186      search_path[0] = fs::path(base_dir, fs::native) / 
    188                        (std::string("lib") + bit_suffix) / 
    189                        std::string(vrjuggler_subdir) / std::string("plugins"); 
     187                          (std::string("lib") + bit_suffix) / 
     188                          std::string(vrjuggler_subdir) / 
     189                          std::string("plugins"); 
    190190 
    191191      try